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

Merge branch 'master' into 0.9.x 

Conflicts:
	classes/Memcached_DataObject.php
This commit is contained in:
Evan Prodromou 2010-01-02 19:47:34 -10:00
parent 2851296c8d d32fb7c7c4
commit 90a2563a90
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
classes/Memcached_DataObject.php
View File

@ -23,7 +23,7 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
class Memcached_DataObject extends DB_DataObject
{
/**
/**
* Destructor to free global memory resources associated with
* this data object when it's unset or goes out of scope.
* DB_DataObject doesn't do this yet by itself.
@ -62,14 +62,14 @@ class Memcached_DataObject extends DB_DataObject
} else {
$i = DB_DataObject::factory($cls);
if (empty($i)) {
return null;
return false;
}
$result = $i->get($k, $v);
if ($result) {
$i->encache();
return $i;
} else {
return null;
return false;
}
}
}
@ -122,7 +122,7 @@ class Memcached_DataObject extends DB_DataObject
}
static function cacheKey($cls, $k, $v) {
if (is_object($cls) || is_object($j) || is_object($v)) {
if (is_object($cls) || is_object($k) || is_object($v)) {
$e = new Exception();
common_log(LOG_ERR, __METHOD__ . ' object in param: ' .
str_replace("\n", " ", $e->getTraceAsString()));
@ -262,18 +262,6 @@ 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

2
classes/Notice.php
View File

@ -214,7 +214,7 @@ class Notice extends Memcached_DataObject
extract($options);
}
if (empty($is_local)) {
if (!isset($is_local)) {
$is_local = Notice::LOCAL_PUBLIC;
}