[checkmk-commits] 4674 FIX CSV/JSON export: Fixed exception in icon columns

Module: check_mk Branch: master Commit: 426b947525133f5716ac640575a286d144c4ae24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=426b947525133f… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu May 11 10:27:07 2017 +0200 4674 FIX CSV/JSON export: Fixed exception in icon columns Change-Id: I27f47ab6fd3dd7b3e85d0e549cea08207bf61816 --- .werks/4674 | 11 +++++++++++ web/plugins/views/painters.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4674 b/.werks/4674 new file mode 100644 index 0000000..a2ebf1f --- /dev/null +++ b/.werks/4674 @@ -0,0 +1,11 @@ +Title: CSV/JSON export: Fixed exception in icon columns +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494491204 + + diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 3778520..994e610 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -318,7 +318,7 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): icons.append((sort_index, result)) else: # Strip icon names out of HTML code that is generated by htmllib.render_icon() - for n in regex('<img src="([^"]*)"[^>]*>').findall(result): + for n in regex('<img src="([^"]*)"[^>]*>').findall("%s" % result): if n.startswith("images/"): n = n[7:] if n.startswith("icon_"):