summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-11 13:24:52 -0800
committerBrion Vibber <brion@pobox.com>2010-01-11 13:24:52 -0800
commitf397d355276c57941617049808ff59a5f2538beb (patch)
tree0d990f7d71715c9feccc394f7690bf009e470932
parentbe1ac6678de2534e1ec42c4dc779fec240d1ebd7 (diff)
Regression fix: don't spew notices to log every time we get a non-cached user object
-rw-r--r--classes/Memcached_DataObject.php2
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;