Merge remote branch 'gitorious/0.9.x' into 1.0.x

Conflicts: lib/common.php
2010-12-30 15:52:08 -08:00
parent e211e6228d c91b080a8e
commit 32eb4c5e2d
37 changed files with 3034 additions and 107 deletions
--- 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) {