From 698228acb9a6262f2fb4e0c82118249aa94cc0f8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 13:16:59 -0400
Subject: Revert "Revert "run 'set names' after each connection to deal with
 UTF8 correctly""

This reverts commit 86770ccde7914219a0a572ced6dd21fa65566e1d.
---
 classes/Memcached_DataObject.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'classes')

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 5f71f716b..877bbf2e0 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -227,4 +227,20 @@ class Memcached_DataObject extends DB_DataObject
         $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
         return new ArrayWrapper($cached);
     }
+
+    // We overload so that 'SET NAMES "utf8"' is called for
+    // each connection
+
+    function _connect()
+    {
+        global $_DB_DATAOBJECT;
+        $exists = !empty($this->_database_dsn_md5) &&
+          isset($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]);
+        $result = parent::_connect();
+        if (!$exists) {
+            $DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
+            $DB->query('SET NAMES "utf8"');
+        }
+        return $result;
+    }
 }
-- 
cgit v1.2.3-54-g00ecf


From d068680e1913a32eba0f5b0e1e746ac66ec638d3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 27 May 2009 14:57:45 -0400
Subject: optionally use SET NAMES for utf8 to DB

---
 README                           | 4 ++++
 classes/Memcached_DataObject.php | 4 +++-
 lib/common.php                   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/README b/README
index 7b2dcacc5..c23d4e464 100644
--- a/README
+++ b/README
@@ -906,6 +906,10 @@ mirror: you can set this to an array of DSNs, like the above
 	and adding the slaves to this array. Note that if you want some
 	requests to go to the 'database' (master) server, you'll need
 	to include it in this array, too.
+utf8: whether to talk to the database in UTF-8 mode. This is the default
+      with new installations, but older sites may want to turn it off
+      until they get their databases fixed up. See "UTF-8 database"
+      above for details.
 
 syslog
 ------
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 877bbf2e0..52ad4100f 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -239,7 +239,9 @@ class Memcached_DataObject extends DB_DataObject
         $result = parent::_connect();
         if (!$exists) {
             $DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
-            $DB->query('SET NAMES "utf8"');
+            if (common_config('db', 'utf8')) {
+                $DB->query('SET NAMES "utf8"');
+            }
         }
         return $result;
     }
diff --git a/lib/common.php b/lib/common.php
index f983c4d16..8f95c2361 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -167,6 +167,7 @@ $config['db'] =
         'require_prefix' => 'classes/',
         'class_prefix' => '',
         'mirror' => null,
+        'utf8' => true,
         'db_driver' => 'DB', # XXX: JanRain libs only work with DB
         'quote_identifiers' => false,
         'type' => 'mysql' );
-- 
cgit v1.2.3-54-g00ecf