summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-24 15:00:52 -0500
committerEvan Prodromou <evan@status.net>2010-02-24 15:00:52 -0500
commitdaea98878692cadc9406be16fe2e15a419add3c4 (patch)
treed7b5e0ec34b04c7f91c43a4e5761dc764c64330a /classes
parentf5ec7c27070dac4ac28ba860f4cc9a808b5f7c30 (diff)
parent07214f1370547fcc64db34ce8c8a84ec70e0d5bd (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes')
-rw-r--r--classes/Memcached_DataObject.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 40576dc71..bc4c3a000 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -501,7 +501,11 @@ class Memcached_DataObject extends Safe_DataObject
function raiseError($message, $type = null, $behaviour = null)
{
- throw new ServerException("DB_DataObject error [$type]: $message");
+ $id = get_class($this);
+ if ($this->id) {
+ $id .= ':' . $this->id;
+ }
+ throw new ServerException("[$id] DB_DataObject error [$type]: $message");
}
static function cacheGet($keyPart)