Merge branch 'master' into testing

[quix0rs-gnu-social.git] / classes / Memcached_DataObject.php

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 8d54e1f0f012e9610b5c66c11f2167738f76af63..0836c2019f82486232f196a977b25f0563318f5d 100644 (file)
--- 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");
     }