Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / subedit.php

diff --git a/actions/subedit.php b/actions/subedit.php
index 3b77aff584fc4b3446dc10a1fa08b531ae878459..4dc3e855aa3b0f4dd3d804149c8e756b2476ea10 100644 (file)
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -24,22 +24,21 @@ class SubeditAction extends Action
 {
     var $profile = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            // TRANS: Client error displayed trying a change a subscription while not logged in.
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return false;
         }
 
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token. '.
                                  'Try again, please.'));
-            return false;
         }
 
         $id = $this->trimmed('profile');
@@ -47,21 +46,19 @@ class SubeditAction extends Action
         if (!$id) {
             // TRANS: Client error displayed trying a change a subscription without providing a profile.
             $this->clientError(_('No profile specified.'));
-            return false;
         }
 
-        $this->profile = Profile::staticGet('id', $id);
+        $this->profile = Profile::getKV('id', $id);
 
         if (!$this->profile) {
             // TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
             $this->clientError(_('No profile with that ID.'));
-            return false;
         }
 
         return true;
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -73,7 +70,6 @@ class SubeditAction extends Action
             if (!$sub) {
                 // TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
                 $this->clientError(_('You are not subscribed to that profile.'));
-                return false;
             }
 
             $orig = clone($sub);
@@ -87,12 +83,9 @@ class SubeditAction extends Action
                 common_log_db_error($sub, 'UPDATE', __FILE__);
                 // TRANS: Server error displayed when updating a subscription fails with a database error.
                 $this->serverError(_('Could not save subscription.'));
-                return false;
             }
 
-            common_redirect(common_local_url('subscriptions',
-                                             array('nickname' => $cur->nickname)),
-                            303);
+            common_redirect(common_local_url('subscriptions', array('nickname' => $cur->nickname)), 303);
         }
     }
 }