diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php index e957e7ba8f..0e328b1514 100644 --- a/classes/Managed_DataObject.php +++ b/classes/Managed_DataObject.php @@ -61,6 +61,20 @@ abstract class Managed_DataObject extends Memcached_DataObject return parent::pkeyGetClass(get_called_class(), $kv); } + /** + * Get multiple items from the database by key + * + * @param string $keyCol name of column for key + * @param array $keyVals key values to fetch + * @param boolean $skipNulls return only non-null results? + * + * @return array Array of objects, in order + */ + static function multiGet($keyCol, array $keyVals, $skipNulls=true) + { + return parent::multiGetClass(get_called_class(), $keyCol, $keyVals, $skipNulls); + } + /** * Get multiple items from the database by key * diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 5778ad9542..288457c0f1 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -74,7 +74,7 @@ class Memcached_DataObject extends Safe_DataObject * * @return array Array of objects, in order */ - function multiGet($cls, $keyCol, array $keyVals, $skipNulls=true) + static function multiGetClass($cls, $keyCol, array $keyVals, $skipNulls=true) { $result = self::pivotGetClass($cls, $keyCol, $keyVals); diff --git a/classes/Notice.php b/classes/Notice.php index 630da81106..7b87e394ce 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -130,11 +130,6 @@ class Notice extends Managed_DataObject return $def; } - - function multiGet($kc, $kvs, $skipNulls=true) - { - return Memcached_DataObject::multiGet('Notice', $kc, $kvs, $skipNulls); - } /* Notice types */ const LOCAL_PUBLIC = 1; @@ -831,7 +826,7 @@ class Notice extends Managed_DataObject $ids[] = $f2p->file_id; } - $files = Memcached_DataObject::multiGet('File', 'id', $ids); + $files = File::multiGet('id', $ids); $this->_attachments = $files->fetchAll(); diff --git a/classes/Profile.php b/classes/Profile.php index c8f44c007b..6f502c9c18 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -78,11 +78,6 @@ class Profile extends Managed_DataObject return $def; } - - function multiGet($keyCol, $keyVals, $skipNulls=true) - { - return parent::multiGet('Profile', $keyCol, $keyVals, $skipNulls); - } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE diff --git a/classes/User_group.php b/classes/User_group.php index 8f7a0d7b58..142f619965 100644 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -30,11 +30,6 @@ class User_group extends Managed_DataObject public $join_policy; // tinyint public $force_scope; // tinyint - function multiGet($keyCol, $keyVals, $skipNulls=true) - { - return parent::multiGet('User_group', $keyCol, $keyVals, $skipNulls); - } - /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php index c33097fd81..0f84006a65 100644 --- a/plugins/ActivitySpam/ActivitySpamPlugin.php +++ b/plugins/ActivitySpam/ActivitySpamPlugin.php @@ -254,7 +254,7 @@ class ActivitySpamPlugin extends Plugin foreach ($notices as $notice) { $ids[] = $notice->id; } - Memcached_DataObject::multiGet('Spam_score', 'notice_id', $ids); + Spam_score::multiGet('notice_id', $ids); } return true; }