Merge branch 'master' into 0.9.x

2010-04-07 10:46:23 -04:00
parent ae139c4ddf 9ea0b06452
commit 76cce8a3c5
2 changed files with 38 additions and 3 deletions
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -573,6 +573,9 @@ class Memcached_DataObject extends Safe_DataObject
        if ($this->id) {
            $id .= ':' . $this->id;
        }
+        if ($message instanceof PEAR_Error) {
+            $message = $message->getMessage();
+        }
        throw new ServerException("[$id] DB_DataObject error [$type]: $message");
    }