Merge branch 'master' into testing

This commit is contained in:
Evan Prodromou 2010-04-07 10:45:44 -04:00
commit 08745e4eac

View File

@ -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");
}