Moved multiGet into Managed_DataObject

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index e957e7ba8f505a120c4ab45dbce668ce2bfae121..0e328b151416e20b4a29268f8be3be419d31b62e 100644 (file)
--- 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 5778ad95424774a57c8e207b50bf0bbc3d994d81..288457c0f1a7933e8e33e968777be7d50538021f 100644 (file)
--- 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 630da81106543d604274893a892c33981896d206..7b87e394ce08bd3f51d5adee867f40a69c56dac7 100644 (file)
--- 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 c8f44c007b03c3fa24ba9f76cea53651ad9d00a6..6f502c9c188ced49fa8738a21dd200179e829a93 100644 (file)
--- 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 8f7a0d7b586e7ffa72d58ffc98e1aa74c81e2b4e..142f6199653552f4972cbe94eff7d8faf8e9c00f 100644 (file)
--- 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 c33097fd8159eb13daa1e515cb7772f509f09cdd..0f84006a6589be9d046b3a18e7ed2c60981b8400 100644 (file)
--- 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;
     }