diff options
| author | Evan Prodromou <evan@status.net> | 2010-04-07 10:47:29 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-04-07 10:47:29 -0400 |
| commit | 727ea5a5163249eb40fa0c4b2c63054fc997473b (patch) | |
| tree | e7c412d8d858d7d7dba60ea15fb62e6ac83ef1fc /classes/Memcached_DataObject.php | |
| parent | 439fd589eb256e7ee48796ee7c880536325fa2cb (diff) | |
| parent | ecf32880254666860335d4fe2a96909cd592d3e8 (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'classes/Memcached_DataObject.php')
| -rw-r--r-- | classes/Memcached_DataObject.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index d26a6a5ea..85273a9b7 100644 --- 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"); } |