diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-02-02 01:27:57 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-02-02 01:27:57 +0000 |
| commit | d96be836c15c5dc20b380fe34fd4fdd334f55b11 (patch) | |
| tree | 59b5791767e052d2c5e44aa4bc47403a3e842b59 /database | |
| parent | dcb092e62749835977a6c77087f9d7791bf707f8 (diff) | |
| download | brdo-d96be836c15c5dc20b380fe34fd4fdd334f55b11.tar.gz brdo-d96be836c15c5dc20b380fe34fd4fdd334f55b11.tar.bz2 | |
- #40515: MySQL UTF-8 conversion fixes
Diffstat (limited to 'database')
| -rw-r--r-- | database/updates.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/database/updates.inc b/database/updates.inc index 7f9a50902..b09442529 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -1491,10 +1491,11 @@ function _system_update_utf8($tables) { } // See if database uses UTF-8 already - $url = parse_url($GLOBALS['db_url']); + global $db_url; + $url = parse_url(is_array($db_url) ? $db_url['default'] : $db_url); $db_name = substr($url['path'], 1); - list(, $create) = db_fetch_array(db_query('SHOW CREATE DATABASE `%s`', $db_name)); - if (preg_match('/utf8/i', $create)) { + $result = db_fetch_array(db_query('SHOW CREATE DATABASE `%s`', $db_name)); + if (preg_match('/utf8/i', array_pop($result))) { return array(); } |