diff options
| author | Evan Prodromou <evan@status.net> | 2010-04-07 10:45:44 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-04-07 10:45:44 -0400 |
| commit | 08745e4eac168996567683a5b91e663a71fafecc (patch) | |
| tree | 23e7afd008723e146da436f03033926d524a05ff /classes | |
| parent | 878461d50d36808fa812e0d4a0e1784e31dbbd6f (diff) | |
| parent | 9ea0b0645249b7e3f4cb37ac6bc3ff8c628ad2ba (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'classes')
| -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 8d54e1f0f..0836c2019 100644 --- 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"); } |