- 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
This commit is contained in:
parent
fceb26e231
commit
26474d349f
5 changed files with 25 additions and 10 deletions
|
|
@ -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 |
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue