From 26474d349f6f03b3f74beb91ef680f0c634e05d5 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 9 Sep 2008 01:16:32 +0000 Subject: - fix issue when picture_url_style = file (sql query like) - sql call SET NAMES "xxx" (if required) in upgrade.php, upgrade_feed.php and after 65-database.php git-svn-id: http://piwigo.org/svn/trunk@2512 68402e56-0260-453c-a942-63ccdbb3a9ee --- upgrade_feed.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'upgrade_feed.php') diff --git a/upgrade_feed.php b/upgrade_feed.php index 44ccbe5db..f50b69433 100644 --- a/upgrade_feed.php +++ b/upgrade_feed.php @@ -42,10 +42,14 @@ define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db'); // | Database connection | // +-----------------------------------------------------------------------+ -mysql_connect($cfgHote, $cfgUser, $cfgPassword) -or die("Could not connect to database server"); -mysql_select_db($cfgBase) -or die("Could not connect to database"); +mysql_connect($cfgHote, $cfgUser, $cfgPassword) or die("Could not connect to database server"); +mysql_select_db($cfgBase) or die("Could not connect to database"); +if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') + and defined('DB_CHARSET') and DB_CHARSET!='' ) +{ + pwg_query('SET NAMES "'.DB_CHARSET.'"'); +} + // +-----------------------------------------------------------------------+ // | Upgrades | -- cgit v1.2.3