mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

silence Constant SQL_CHARSET_INIT already defined notices

Browse Source
This commit is contained in:
Ian 2015-01-11 15:27:30 +01:00
parent d758e6b591
commit 12325943a1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/db/mysql.inc.php
View File

@ -279,7 +279,7 @@ function serendipity_db_reconnect() {
if (isset($serendipity['dbCharset'])) { if (isset($serendipity['dbCharset'])) {
mysql_query("SET NAMES " . $serendipity['dbCharset'], $serendipity['dbConn']); mysql_query("SET NAMES " . $serendipity['dbCharset'], $serendipity['dbConn']);
define('SQL_CHARSET_INIT', true); @define('SQL_CHARSET_INIT', true);
} elseif (defined('SQL_CHARSET') && $serendipity['dbNames'] && !defined('SQL_CHARSET_INIT')) { } elseif (defined('SQL_CHARSET') && $serendipity['dbNames'] && !defined('SQL_CHARSET_INIT')) {
mysql_query("SET NAMES " . SQL_CHARSET, $serendipity['dbConn']); mysql_query("SET NAMES " . SQL_CHARSET, $serendipity['dbConn']);
} }

2
include/db/mysqli.inc.php
View File

@ -249,7 +249,7 @@ function serendipity_db_reconnect() {
if (isset($serendipity['dbCharset'])) { if (isset($serendipity['dbCharset'])) {
mysqli_query($serendipity['dbConn'], "SET NAMES " . $serendipity['dbCharset']); mysqli_query($serendipity['dbConn'], "SET NAMES " . $serendipity['dbCharset']);
define('SQL_CHARSET_INIT', true); @define('SQL_CHARSET_INIT', true);
} elseif (defined('SQL_CHARSET') && $serendipity['dbNames'] && !defined('SQL_CHARSET_INIT')) { } elseif (defined('SQL_CHARSET') && $serendipity['dbNames'] && !defined('SQL_CHARSET_INIT')) {
mysqli_query($serendipity['dbConn'], "SET NAMES " . SQL_CHARSET, $serendipity['dbConn']); mysqli_query($serendipity['dbConn'], "SET NAMES " . SQL_CHARSET, $serendipity['dbConn']);
} }

2
include/db/sqlrelay.inc.php
View File

@ -435,7 +435,7 @@ function serendipity_db_reconnect() {
if (isset($serendipity['dbCharset'])) { if (isset($serendipity['dbCharset'])) {
serendipity_db_query("SET NAMES " . $serendipity['dbCharset']); serendipity_db_query("SET NAMES " . $serendipity['dbCharset']);
define('SQL_CHARSET_INIT', true); @define('SQL_CHARSET_INIT', true);
} elseif (defined('SQL_CHARSET') && $serendipity['dbNames'] && !defined('SQL_CHARSET_INIT')) { } elseif (defined('SQL_CHARSET') && $serendipity['dbNames'] && !defined('SQL_CHARSET_INIT')) {
serendipity_db_query("SET NAMES " . SQL_CHARSET); serendipity_db_query("SET NAMES " . SQL_CHARSET);
} }