From: Evan Prodromou <evan@status.net>
Date: Wed, 7 Apr 2010 14:47:29 +0000 (-0400)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=727ea5a5163249eb40fa0c4b2c63054fc997473b;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x
---

727ea5a5163249eb40fa0c4b2c63054fc997473b
diff --cc classes/Memcached_DataObject.php
index d26a6a5eae,0836c2019f..85273a9b7a
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -570,9 -570,12 +570,12 @@@ class Memcached_DataObject extends Safe
      function raiseError($message, $type = null, $behaviour = null)
      {
          $id = get_class($this);
 -        if ($this->id) {
 +        if (!empty($this->id)) {
              $id .= ':' . $this->id;
          }
+         if ($message instanceof PEAR_Error) {
+             $message = $message->getMessage();
+         }
          throw new ServerException("[$id] DB_DataObject error [$type]: $message");
      }