mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 04:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #384 use built-in functions to set charset

Browse source
This commit is contained in:
plegall 2015-12-08 13:39:09 +01:00
parent 5be28962a1
commit 16f6a54fa7
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/dblayer/functions_mysql.inc.php
View file

@ -53,7 +53,7 @@ function pwg_db_check_charset()
{ {
$db_charset = DB_CHARSET; $db_charset = DB_CHARSET;
} }
pwg_query('SET NAMES "'.$db_charset.'"'); mysql_set_charset($db_charset);
} }
function pwg_db_check_version() function pwg_db_check_version()

4
include/dblayer/functions_mysqli.inc.php
View file

@ -80,12 +80,14 @@ function pwg_db_connect($host, $user, $password, $database)
*/ */
function pwg_db_check_charset() function pwg_db_check_charset()
{ {
global $mysqli;
$db_charset = 'utf8'; $db_charset = 'utf8';
if (defined('DB_CHARSET') and DB_CHARSET != '') if (defined('DB_CHARSET') and DB_CHARSET != '')
{ {
$db_charset = DB_CHARSET; $db_charset = DB_CHARSET;
} }
pwg_query('SET NAMES "'.$db_charset.'"'); $mysqli->set_charset($db_charset);
} }
/** /**