GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into batchlocation

This commit is contained in:
Evan Prodromou 2010-01-01 11:26:50 -10:00
parent 55ba858e8c b0527801d9
commit e33b9a8ab8
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
classes/Memcached_DataObject.php
View File

@ -51,11 +51,17 @@ class Memcached_DataObject extends DB_DataObject
if ($i) {
return $i;
} else {
$i = DB_DataObject::staticGet($cls, $k, $v);
if ($i) {
$i->encache();
$i = DB_DataObject::factory($cls);
if (empty($i)) {
return null;
}
$result = $i->get($k, $v);
if ($result) {
$i->encache();
return $i;
} else {
return null;
}
return $i;
}
}
@ -247,6 +253,18 @@ class Memcached_DataObject extends DB_DataObject
return new ArrayWrapper($cached);
}
function cleanup()
{
global $_DB_DATAOBJECT;
if (isset($_DB_DATAOBJECT['RESULTFIELDS'][$this->_DB_resultid])) {
unset($_DB_DATAOBJECT['RESULTFIELDS'][$this->_DB_resultid]);
}
if (isset($_DB_DATAOBJECT['RESULTS'][$this->_DB_resultid])) {
unset($_DB_DATAOBJECT['RESULTS'][$this->_DB_resultid]);
}
}
// We overload so that 'SET NAMES "utf8"' is called for
// each connection