Fixed wrong encoding detection logic in install.php

2006-04-27 23:17:25 +00:00
parent 81c2aa8051
commit 83e8edb463
1 changed files with 1 additions and 1 deletions
@@ -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;