From 068f6801cc59488bfc50ef399a2a4d22b1b7e9c2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 12:27:32 -0400
Subject: Revert "run 'set names' after each connection to deal with UTF8
 correctly"

This reverts commit 84072aa5cf6124d59a06a7f0a7945c00ee2836da.

This commit caused grievous harm to old notices on identi.ca.
Reverting until we figure out how to convert the old notices.
---
 classes/Memcached_DataObject.php | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'classes')

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 877bbf2e0..5f71f716b 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -227,20 +227,4 @@ 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