Module: check_mk
Branch: master
Commit: aaee6123ae48654f27f22e9a2c8e887f18e88e41
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaee6123ae4865…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 16 14:55:05 2017 +0100
4369 FIX Fixed broken host edit page on distributed WATO slave sites (when WATO is
enabled)
Change-Id: I1ea87bf8f2878b97af99222f8d9ad0d52f8d95a1
---
.werks/4369 | 10 ++++++++++
web/htdocs/htmllib.py | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/4369 b/.werks/4369
new file mode 100644
index 0000000..ffb2e2d
--- /dev/null
+++ b/.werks/4369
@@ -0,0 +1,10 @@
+Title: Fixed broken host edit page on distributed WATO slave sites (when WATO is
enabled)
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.5.0i1
+Date: 1487253287
+
+
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 535f391..9ad8d56 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -1302,7 +1302,7 @@ class RequestHandler(object):
def var_utf8(self, varname, deflt = None):
val = self.vars.get(varname, deflt)
- if val != None and type(val) != unicode:
+ if type(val) == str:
return val.decode("utf-8")
else:
return val