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

---
 classes/Memcached_DataObject.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'classes')

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;
     }
-- 
cgit v1.2.3-54-g00ecf