[checkmk-commits] 3442 FIX Fixed double escaping of single quotes in comment texts

Module: check_mk Branch: master Commit: 26d53d9ad3d2d9a8e85fab3cee2152d0a3278882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d53d9ad3d2d9… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Apr 27 13:13:03 2016 +0200 3442 FIX Fixed double escaping of single quotes in comment texts --- .werks/3442 | 10 ++++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3442 b/.werks/3442 new file mode 100644 index 0000000..de49b5b --- /dev/null +++ b/.werks/3442 @@ -0,0 +1,10 @@ +Title: Fixed double escaping of single quotes in comment texts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461755568 + + diff --git a/ChangeLog b/ChangeLog index d54f426..7c634b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -250,6 +250,7 @@ * 3413 FIX: Correctly display non-Ascii-characters in host tag values in host tag filter * 3029 FIX: rule editor icon: fixed query of invalid livestatus column... * 3125 FIX: fixed grouping of werk list by version... + * 3442 FIX: Fixed double escaping of single quotes in comment texts WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 3a78620..297fb6f 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -552,7 +552,7 @@ def paint_comment_icon(what, row, tags, host_custom_vars): text = "" for c in comments: id, author, comment, ty, timestamp = c - comment = comment.replace("\n", "<br>").replace("'","&#39;") + comment = comment.replace("\n", "<br>") text += "%s %s: \"%s\" \n" % (paint_age(timestamp, True, 0, 'abs')[1], author, comment) return 'comment', text, url_to_view(row, 'comments_of_' + what)