Merge branch '0.9.x' into 1.0.x

2010-04-07 10:47:29 -04:00
parent 439fd589eb ecf3288025
commit 727ea5a516
69 changed files with 13648 additions and 1058 deletions
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -573,6 +573,9 @@ class Memcached_DataObject extends Safe_DataObject
        if (!empty($this->id)) {
            $id .= ':' . $this->id;
        }
+        if ($message instanceof PEAR_Error) {
+            $message = $message->getMessage();
+        }
        throw new ServerException("[$id] DB_DataObject error [$type]: $message");
    }