summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-05 16:43:21 -0800
committerZach Copley <zach@status.net>2010-03-05 16:43:21 -0800
commit3d8ddb7cf1b6477dde4b9e101f26d58d4b09c004 (patch)
tree113e423cf78b917eda4d6fcba2736e1c60e8daac
parentf653c3b914d7983618bd4141fe57a37e9537ec45 (diff)
parent8029faadaecaa2b3b253fa7086be0a25bece0ce5 (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline: Fixed problem causing 500 error on notices containing a non-existent group
-rw-r--r--classes/Group_alias.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/Group_alias.php b/classes/Group_alias.php
index be3d0a6c6..c5a1895a1 100644
--- a/classes/Group_alias.php
+++ b/classes/Group_alias.php
@@ -34,7 +34,7 @@ class Group_alias extends Memcached_DataObject
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
/* Static get */
- function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Group_alias',$k,$v); }
+ function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_alias',$k,$v); }
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE