diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-11 15:12:13 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-11 15:12:13 -0800 |
| commit | 57ac912519d861c7764af4eabbc8e07b10e0b6e7 (patch) | |
| tree | 835f82d02c687cc3e303f836a859e0f1e5d0db3c /classes | |
| parent | 6ef70bf5d9f89cc9bbc6cce3e26fe25ab641567d (diff) | |
| parent | f397d355276c57941617049808ff59a5f2538beb (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Memcached_DataObject.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 21f6781c2..b68a4af8e 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -174,7 +174,7 @@ class Memcached_DataObject extends DB_DataObject $obj = $c->get(Memcached_DataObject::cacheKey($cls, $k, $v)); if (0 == strcasecmp($cls, 'User')) { // Special case for User - if (is_object($obj->id)) { + if (is_object($obj) && is_object($obj->id)) { common_log(LOG_ERR, "User " . $obj->nickname . " was cached with User as ID; deleting"); $c->delete(Memcached_DataObject::cacheKey($cls, $k, $v)); return false; |