[checkmk-commits] Check_MK Git: check_mk: #1773 FIX Fixed different exceptions when using localized multisite

Module: check_mk Branch: master Commit: 181436853194abf5c4690b920ed9de1a47a75e5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=181436853194ab… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Dec 18 13:56:10 2014 +0100 #1773 FIX Fixed different exceptions when using localized multisite --- .werks/1773 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/1773 b/.werks/1773 new file mode 100644 index 0000000..853a83c --- /dev/null +++ b/.werks/1773 @@ -0,0 +1,10 @@ +Title: Fixed different exceptions when using localized multisite +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418907355 + + diff --git a/ChangeLog b/ChangeLog index 58cf766..101f197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views * 1766 FIX: Fixed exceptions in Web GUI when host or service groups used non ascii characters in names... + * 1773 FIX: Fixed different exceptions when using localized multisite WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1bd52a4..63fe4bd 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1268,8 +1268,6 @@ class html: return str(value) elif ty not in [str, unicode]: value = str(value) - elif ty == unicode: - value = value.encode("utf-8") return value.replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;")