From 16f6a54fa719cc79ff942e4bb8139d7ca09ed997 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 8 Dec 2015 13:39:09 +0100
Subject: fixes #384 use built-in functions to set charset

---
 include/dblayer/functions_mysql.inc.php  | 2 +-
 include/dblayer/functions_mysqli.inc.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/dblayer')

diff --git a/include/dblayer/functions_mysql.inc.php b/include/dblayer/functions_mysql.inc.php
index a1853b223..9cf25e76f 100644
--- a/include/dblayer/functions_mysql.inc.php
+++ b/include/dblayer/functions_mysql.inc.php
@@ -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()
diff --git a/include/dblayer/functions_mysqli.inc.php b/include/dblayer/functions_mysqli.inc.php
index 390cf2e06..f9590c1d1 100644
--- a/include/dblayer/functions_mysqli.inc.php
+++ b/include/dblayer/functions_mysqli.inc.php
@@ -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;
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3