diff options
| author | rvelices <rv-github@modusoptimus.com> | 2008-09-09 01:16:32 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2008-09-09 01:16:32 +0000 |
| commit | 26474d349f6f03b3f74beb91ef680f0c634e05d5 (patch) | |
| tree | 0a72774c7651facbb21ecf41764a939535ce6cfa /install/db | |
| parent | fceb26e23175ff93988091a05c80443a39b9d865 (diff) | |
- 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
Diffstat (limited to '')
| -rw-r--r-- | install/db/65-database.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/install/db/65-database.php b/install/db/65-database.php index daa59de30..0381f0ac3 100644 --- a/install/db/65-database.php +++ b/install/db/65-database.php @@ -298,6 +298,11 @@ define(\'DB_COLLATE\', \'\'); define('DB_CHARSET', $db_charset); define('DB_COLLATE', ''); + if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') and DB_CHARSET!='' ) + { + pwg_query('SET NAMES "'.DB_CHARSET.'"'); + } + echo $upgrade_log; $fp = @fopen( PHPWG_ROOT_PATH.'upgrade65.log', 'w' ); if ($fp) |