Disable legacy encoding mode when modpython is loaded.

Python is not happy when using non-unicode text as str.

Fix #1229
This commit is contained in:
Alexey Sokolov
2016-01-09 14:09:34 +00:00
parent 1e1fadbc2b
commit 4fe4a45dd6
8 changed files with 37 additions and 4 deletions

View File

@@ -1013,7 +1013,10 @@ class CWebAdminMod : public CModule {
Tmpl["EncodingUtf"] = "simple";
Tmpl["Encoding"] = sEncoding;
}
Tmpl["LegacyEncodingDisabled"] =
CString(CZNC::Get().IsForcingEncoding());
#else
Tmpl["LegacyEncodingDisabled"] = "true";
Tmpl["EncodingDisabled"] = "true";
Tmpl["EncodingUtf"] = "legacy";
#endif
@@ -1353,7 +1356,10 @@ class CWebAdminMod : public CModule {
Tmpl["EncodingUtf"] = "simple";
Tmpl["Encoding"] = sEncoding;
}
Tmpl["LegacyEncodingDisabled"] =
CString(CZNC::Get().IsForcingEncoding());
#else
Tmpl["LegacyEncodingDisabled"] = "true";
Tmpl["EncodingDisabled"] = "true";
Tmpl["EncodingUtf"] = "legacy";
#endif