SET NAMES command was not really called until now. Thanks to Josef Moravek from the...

diff --git a/include/db/mysql.inc.php b/include/db/mysql.inc.php
index db9027fb889a87a02721ea4b02b51705be53ebde..49393b31969a3cb23e254b9b076171d04c3506c6 100644 (file)
--- a/include/db/mysql.inc.php
+++ b/include/db/mysql.inc.php
@@ -263,11 +263,17 @@ function serendipity_db_connect() {
 
     $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
     mysql_select_db($serendipity['dbName']);
+    serendipity_db_reconnect();
+
+    return $serendipity['dbConn'];
+}
+
+function serendipity_db_reconnect() {
+    global $serendipity;
+
     if (defined('SQL_CHARSET') && $serendipity['dbNames']) {
         mysql_query("SET NAMES " . SQL_CHARSET, $serendipity['dbConn']);
     }
-
-    return $serendipity['dbConn'];
 }
 
 /**

diff --git a/include/db/mysqli.inc.php b/include/db/mysqli.inc.php
index 0be7888194e4d92f461d610c5c0ea6513dca9984..fd13abdb981d4e0f99bfb7696b72ee1f72138bba 100644 (file)
--- a/include/db/mysqli.inc.php
+++ b/include/db/mysqli.inc.php
@@ -232,12 +232,17 @@ function serendipity_db_connect() {
 
     $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
     mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']);
+    serendipity_db_reconnect();
+
+    return $serendipity['dbConn'];
+}
+
+function serendipity_db_reconnect() {
+    global $serendipity;
 
     if (defined('SQL_CHARSET') && $serendipity['dbNames']) {
         mysqli_query($serendipity['dbConn'], "SET NAMES " . SQL_CHARSET);
     }
-
-    return $serendipity['dbConn'];
 }
 
 /**

diff --git a/include/db/postgres.inc.php b/include/db/postgres.inc.php
index b6459dcee610cc7348075b64679fd3ee26791a23..714d25ed6d5df994d5309cf5bc08b971d73ba65d 100644 (file)
--- a/include/db/postgres.inc.php
+++ b/include/db/postgres.inc.php
@@ -66,6 +66,9 @@ function serendipity_db_connect() {
     return $serendipity['dbConn'];
 }
 
+function serendipity_db_reconnect() {
+}
+
 /**
  * Returns a escaped string, so that it can be safely included in a SQL string encapsulated within quotes, without allowing SQL injection.
  *

diff --git a/include/db/sqlite.inc.php b/include/db/sqlite.inc.php
index f1b52d12ddc6d28a0ac5af780e22cdd5d7d85b4a..95758265da0fab09a1bc4d855be2e0c69dc268c2 100644 (file)
--- a/include/db/sqlite.inc.php
+++ b/include/db/sqlite.inc.php
@@ -56,6 +56,9 @@ function serendipity_db_connect()
     return $serendipity['dbConn'];
 }
 
+function serendipity_db_reconnect() {
+}
+
 /**
  * Returns a escaped string, so that it can be safely included in a SQL string encapsulated within quotes, without allowing SQL injection.
  *

diff --git a/include/lang.inc.php b/include/lang.inc.php
index a0bf0e98e60f29c66c1ec6ca3a2a268857b58254..91770e2ab23a591340594febea1b3db98f771ca0 100644 (file)
--- a/include/lang.inc.php
+++ b/include/lang.inc.php
@@ -9,6 +9,7 @@ if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     if (@include(S9Y_INCLUDE_PATH . 'lang/' . $charset . 'serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
         // Only here can we truely say the language is loaded
         define('serendipity_LANG_LOADED', true);
+        serendipity_db_reconnect();
     } elseif (IS_installed === false || (defined('IS_up2date') && IS_up2date === false)) {   /* -- Auto-Guess -- */
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
@@ -27,7 +28,7 @@ if (!defined('serendipity_MB_LOADED') && defined('serendipity_LANG_LOADED')) {
     if (function_exists('mb_language')) {
         @mb_language($serendipity['lang']);
     }
-    
+
     if (function_exists('mb_internal_encoding')) {
         @mb_internal_encoding(LANG_CHARSET);
     }