Revert "run 'set names' after each connection to deal with UTF8 correctly"

This reverts commit 84072aa5cf.

This commit caused grievous harm to old notices on identi.ca.
Reverting until we figure out how to convert the old notices.
This commit is contained in:
Evan Prodromou 2009-04-26 12:27:32 -04:00
parent a7089de228
commit 86770ccde7

View File

@ -227,20 +227,4 @@ class Memcached_DataObject extends DB_DataObject
$c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry); $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
return new ArrayWrapper($cached); 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;
}
} }