Some cleanups:

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

diff --git a/actions/addpeopletag.php b/actions/addpeopletag.php
index e5e52b83f007d58f0d9e4d2140bc8bc73632cc87..551e9688597e6433dfd84a13d0aa0c2cc0c042d1 100644 (file)
--- a/actions/addpeopletag.php
+++ b/actions/addpeopletag.php
@@ -77,7 +77,6 @@ class AddpeopletagAction extends Action
             // 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;
         }
 
         // Only for logged-in users
@@ -87,7 +86,6 @@ class AddpeopletagAction extends Action
         if (empty($this->user)) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return false;
         }
 
         // Profile to subscribe to
@@ -99,7 +97,6 @@ class AddpeopletagAction extends Action
         if (empty($this->tagged)) {
             // TRANS: Client error displayed trying to perform an action related to a non-existing profile.
             $this->clientError(_('No such profile.'));
-            return false;
         }
 
         $id = $this->arg('peopletag_id');
@@ -108,7 +105,6 @@ class AddpeopletagAction extends Action
         if (empty($this->peopletag)) {
             // TRANS: Client error displayed trying to reference a non-existing list.
             $this->clientError(_('No such list.'));
-            return false;
         }
 
         return true;
@@ -131,7 +127,8 @@ class AddpeopletagAction extends Action
 
         if (!$ptag) {
             $user = User::getKV('id', $id);
-            if ($user) {
+
+            if ($user instanceof User) {
                 $this->clientError(
                         // TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
                         // TRANS: %s is a username.
@@ -144,7 +141,6 @@ class AddpeopletagAction extends Action
                                       'The remote server is probably not responding correctly. ' .
                                       'Please try retrying later.'), $this->profile->profileurl));
             }
-            return false;
         }
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
@@ -156,7 +152,7 @@ class AddpeopletagAction extends Action
             $unsubscribe = new UntagButton($this, $this->tagged, $this->peopletag);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('subscriptions',
                                     array('nickname' => $this->user->nickname));