summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-04-26 12:27:32 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-04-26 12:28:20 -0400
commit86770ccde7914219a0a572ced6dd21fa65566e1d (patch)
treeee3232e75d23ddcf6f0af0d1e004750473c1829a
parenta7089de22851060c551c9f43366bc197bddebb07 (diff)
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.
-rw-r--r--classes/Memcached_DataObject.php16
1 files changed, 0 insertions, 16 deletions
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;
- }
}