Merge branch '1.7.x'

This commit is contained in:
Alexey Sokolov committed 2019-03-30 16:17:59 +00:00
commit 8d309bbb3d
6 files changed
+44 -9

No files matched your search

+1 -1
View File
@@ -495,7 +495,7 @@ class CAdminMod : public CModule {
#ifdef HAVE_ICU
else if (sVar == "clientencoding") {
pUser->SetClientEncoding(sValue);
PutModule("ClientEncoding = " + sValue);
PutModule("ClientEncoding = " + pUser->GetClientEncoding());
}
#endif
else