Fixed wrong encoding detection logic in install.php

diff --git a/install.php b/install.php
index 72f7990997460c70679e89e1ccf1700a06677874..51d19e03201b64cc92e23baaccb08fc8567a3620 100644 (file)
--- a/install.php
+++ b/install.php
@@ -329,7 +329,7 @@ if ($INSTALL['stage'] == DATABASE) {
                         $rs = $db->Execute("SHOW server_encoding");
                         if ($rs && $rs->RecordCount() > 0) {
                             $encoding = $rs->fields['server_encoding'];
-                            if (strtoupper($encoding) != 'UNICODE' || strtoupper($encoding) != 'UTF8') {
+                            if (strtoupper($encoding) != 'UNICODE' && strtoupper($encoding) != 'UTF8') {
                                 $errormsg = get_string('dbwrongencoding', 'install', $encoding);
                                 $nextstage = DATABASE;
                                 $INSTALL['showskipdbencodingtest'] = true;