From 763a5f182d1725684ee76aca66cfc22f60d0b4e8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 26 Dec 2010 21:08:20 -0800
Subject: [PATCH] Memcache_DataObject checks for PEAR::isError() on results

---
 classes/Memcached_DataObject.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index eb5d2627f2..d50b4071d1 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -74,7 +74,7 @@ class Memcached_DataObject extends Safe_DataObject
             return $i;
         } else {
             $i = DB_DataObject::factory($cls);
-            if (empty($i)) {
+            if (empty($i) || PEAR::isError($i)) {
                 return false;
             }
             foreach ($kv as $k => $v) {