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 /includes | |
| parent | dcb092e62749835977a6c77087f9d7791bf707f8 (diff) | |
| download | brdo-d96be836c15c5dc20b380fe34fd4fdd334f55b11.tar.gz brdo-d96be836c15c5dc20b380fe34fd4fdd334f55b11.tar.bz2 | |
- #40515: MySQL UTF-8 conversion fixes
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database.mysql.inc | 6 | ||||
| -rw-r--r-- | includes/database.mysqli.inc | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc index 8ee51bbe1..fd8dd4b37 100644 --- a/includes/database.mysql.inc +++ b/includes/database.mysql.inc @@ -83,12 +83,6 @@ function db_connect($url) { /* On MySQL 4.1 and later, force UTF-8 */ if (version_compare(mysql_get_server_info(), '4.1.0', '>=')) { mysql_query('SET NAMES "utf8"', $connection); - mysql_query('SET collation_connection="utf8_general_ci"', $connection); - mysql_query('SET collation_server="utf8_general_ci"', $connection); - mysql_query('SET character_set_client="utf8"', $connection); - mysql_query('SET character_set_connection="utf8"', $connection); - mysql_query('SET character_set_results="utf8"', $connection); - mysql_query('SET character_set_server="utf8"', $connection); } return $connection; } diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index 372dcc558..68dcc8d3e 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -79,12 +79,6 @@ function db_connect($url) { /* Force UTF-8 */ mysqli_query($connection, 'SET NAMES "utf8"'); - mysqli_query($connection, 'SET collation_connection="utf8_general_ci"'); - mysqli_query($connection, 'SET collation_server="utf8_general_ci"'); - mysqli_query($connection, 'SET character_set_client="utf8"'); - mysqli_query($connection, 'SET character_set_connection="utf8"'); - mysqli_query($connection, 'SET character_set_results="utf8"'); - mysqli_query($connection, 'SET character_set_server="utf8"'); /** * from: http://bugs.php.net/bug.php?id=33772 |