ForceGroup and some qvitter API stuff still used staticGet

diff --git a/actions/apiaccountregister.php b/actions/apiaccountregister.php
index be66710d80ef1d3fb60519612c1f2f004fa9b611..abddbeacaba8bd4384de007e907ee88c0e1f32d7 100644 (file)
--- a/actions/apiaccountregister.php
+++ b/actions/apiaccountregister.php
@@ -102,7 +102,7 @@ class ApiAccountRegisterAction extends ApiAction
         }
 
         if (!empty($this->code)) {
-            $this->invite = Invitation::staticGet('code', $this->code);
+            $this->invite = Invitation::getKV('code', $this->code);
             if (empty($this->invite)) {
             // TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
                    $this->clientError(_('Sorry, invalid invitation code.'), 401);
@@ -197,7 +197,7 @@ class ApiAccountRegisterAction extends ApiAction
         if (!$email || strlen($email) == 0) {
             return false;
         }
-        $user = User::staticGet('email', $email);
+        $user = User::getKV('email', $email);
         return is_object($user);
     }
 

diff --git a/actions/apiexternalprofileshow.php b/actions/apiexternalprofileshow.php
index 5abb2e3c74d088147b094f10ae8b4c5433357cef..4e9f3ebc48319d6d5cdb5b79efb99e560ac7e9fd 100644 (file)
--- a/actions/apiexternalprofileshow.php
+++ b/actions/apiexternalprofileshow.php
@@ -53,7 +53,7 @@ class ApiExternalProfileShowAction extends ApiPrivateAuthAction
         $profileurl = urldecode($this->arg('profileurl'));        
 
         // TODO: Make this more ... unique!
-        $this->profile = Profile::staticGet('profileurl', $profileurl);        
+        $this->profile = Profile::getKV('profileurl', $profileurl);        
 
         if (!($this->profile instanceof Profile)) {
             // TRANS: Client error displayed when requesting profile information for a non-existing profile.

diff --git a/actions/apistatusesfavs.php b/actions/apistatusesfavs.php
index a736208276d4a49ad225edf3fa6e5e4c41d5ec2d..8e637b41cfbe5c1e33e5bdcebd35a17a0708c547 100644 (file)
--- a/actions/apistatusesfavs.php
+++ b/actions/apistatusesfavs.php
@@ -56,7 +56,7 @@ class ApiStatusesFavsAction extends ApiAuthAction
 
         $id = $this->trimmed('id');
 
-        $this->original = Notice::staticGet('id', $id);
+        $this->original = Notice::getKV('id', $id);
 
         if (!($this->original instanceof Notice)) {
             // TRANS: Client error displayed trying to display redents of a non-exiting notice.
@@ -102,7 +102,7 @@ class ApiStatusesFavsAction extends ApiAuthAction
                $ids_with_profile_data = array();
                $i=0;
                foreach($ids as $id) {
-                       $profile = Profile::staticGet('id', $id);
+                       $profile = Profile::getKV('id', $id);
                        $ids_with_profile_data[$i]['user_id'] = $id;
                        $ids_with_profile_data[$i]['nickname'] = $profile->nickname;
                        $ids_with_profile_data[$i]['fullname'] = $profile->fullname;                    

diff --git a/plugins/ForceGroup/ForceGroupPlugin.php b/plugins/ForceGroup/ForceGroupPlugin.php
index 626275d6b96b267584bcaf977ccfe8cd607f150f..be4fd7807055af0d94043095674f73f75a787bd1 100644 (file)
--- a/plugins/ForceGroup/ForceGroupPlugin.php
+++ b/plugins/ForceGroup/ForceGroupPlugin.php
@@ -53,7 +53,7 @@ class ForceGroupPlugin extends Plugin
     {
         $profile = $notice->getProfile();
 
-        $isRemote = !(User::staticGet('id', $profile->id));
+        $isRemote = !(User::getKV('id', $profile->id));
         if ($isRemote) {
             /*
              * Notices from remote users on other sites