Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/replies.php b/actions/replies.php
index 86042557dc11d2cb1afebc12b14ecb55669365f2..d6d2cb4ba936938c38f65e8fcd48eaa3f424cf3d 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -65,12 +65,11 @@ class RepliesAction extends Action
 
         $nickname = common_canonical_nickname($this->arg('nickname'));
 
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
 
         if (!$this->user) {
             // TRANS: Client error displayed when trying to reply to a non-exsting user.
             $this->clientError(_('No such user.'));
-            return false;
         }
 
         $profile = $this->user->getProfile();
@@ -78,7 +77,6 @@ class RepliesAction extends Action
         if (!$profile) {
             // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
-            return false;
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;