Permalink
Browse files

PostgreSQL 8 compatibility fix for database character set detecting

  • Loading branch information...
patrickslee
patrickslee committed Apr 23, 2006
1 parent b96f1ad commit 2544a80de11fcbe4d3a95956239f246586b5c7e0
Showing with 2 additions and 2 deletions.
  1. +1 −1 install.php
  2. +1 −1 lib/setuplib.php
View
@@ -329,7 +329,7 @@
$rs = $db->Execute("SHOW server_encoding");
if ($rs && $rs->RecordCount() > 0) {
$encoding = $rs->fields['server_encoding'];
- if (strtoupper($encoding) != 'UNICODE') {
+ if (strtoupper($encoding) != 'UNICODE' || strtoupper($encoding) != 'UTF8') {
$errormsg = get_string('dbwrongencoding', 'install', $encoding);
$nextstage = DATABASE;
$INSTALL['showskipdbencodingtest'] = true;
View
@@ -108,7 +108,7 @@ function setup_is_unicodedb() {
$rs = $db->Execute("SHOW server_encoding");
if ($rs && $rs->RecordCount() > 0) {
$encoding = $rs->fields['server_encoding'];
- if (strtoupper($encoding) == 'UNICODE') {
+ if (strtoupper($encoding) == 'UNICODE' || strtoupper($encoding) == 'UTF8') {
$unicodedb = true;
}
}

0 comments on commit 2544a80

Please sign in to comment.