iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-04-30 18:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

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;
}
pwg_query('SET NAMES "'.$db_charset.'"');
mysql_set_charset($db_charset);
}
function pwg_db_check_version()

6
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()
{
global $mysqli;
$db_charset = 'utf8';
if (defined('DB_CHARSET') and DB_CHARSET != '')
{
$db_charset = DB_CHARSET;
}
pwg_query('SET NAMES "'.$db_charset.'"');
$mysqli->set_charset($db_charset);
}
/**
@@ -901,4 +903,4 @@ function query2array($query, $key_name=null, $value_name=null)
return $data;
}
?>
?>