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

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

diff --git a/actions/nudge.php b/actions/nudge.php
index a44915a2d69955a7692547c164d1ecc34d81c5e3..5ceaa180636c76e743fa4d587b355d0dba9e7299 100644 (file)
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -55,23 +55,21 @@ class NudgeAction extends Action
      *
      * @return nothing
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
         if (!common_logged_in()) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return;
         }
 
         $user  = common_current_user();
-        $other = User::staticGet('nickname', $this->arg('nickname'));
+        $other = User::getKV('nickname', $this->arg('nickname'));
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             common_redirect(common_local_url('showstream',
                 array('nickname' => $other->nickname)));
-            return;
         }
 
         // CSRF protection
@@ -80,13 +78,11 @@ class NudgeAction extends Action
         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;
         }
 
         if (!$other->email || !$other->emailnotifynudge) {
             // TRANS: Client error displayed trying to nudge a user that cannot be nudged.
             $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set their email address yet.'));
-            return;
         }
 
         $this->notify($user, $other);
@@ -101,7 +97,7 @@ class NudgeAction extends Action
             // TRANS: Confirmation text after sending a nudge.
             $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             // display a confirmation to the user
             common_redirect(common_local_url('showstream',
@@ -129,7 +125,7 @@ class NudgeAction extends Action
         }
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }