Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index adffe63c388118999c9eda9eba874632a110d7e7..10fd33088d6a60fa3445b1339febd442e595d4be 100644 (file)
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -67,7 +67,6 @@ class GrouplogoAction extends GroupAction
         if (!common_logged_in()) {
             // TRANS: Client error displayed when trying to create a group while not logged in.
             $this->clientError(_('You must be logged in to create a group.'));
-            return false;
         }
 
         $nickname_arg = $this->trimmed('nickname');
@@ -78,13 +77,11 @@ class GrouplogoAction extends GroupAction
         if ($nickname_arg != $nickname) {
             $args = array('nickname' => $nickname);
             common_redirect(common_local_url('grouplogo', $args), 301);
-            return false;
         }
 
         if (!$nickname) {
             // TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
             $this->clientError(_('No nickname.'), 404);
-            return false;
         }
 
         $groupid = $this->trimmed('groupid');
@@ -101,7 +98,6 @@ class GrouplogoAction extends GroupAction
         if (!$this->group) {
             // TRANS: Client error displayed when trying to update logo settings for a non-existing group.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
         $cur = common_current_user();
@@ -109,7 +105,6 @@ class GrouplogoAction extends GroupAction
         if (!$cur->isAdmin($this->group)) {
             // TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
             $this->clientError(_('You must be an admin to edit the group.'), 403);
-            return false;
         }
 
         return true;
@@ -182,7 +177,6 @@ class GrouplogoAction extends GroupAction
             common_log_db_error($user, 'SELECT', __FILE__);
             // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
-            return;
         }
 
         $original = $this->group->original_logo;
@@ -389,7 +383,6 @@ class GrouplogoAction extends GroupAction
         if (!$filedata) {
             // TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
             $this->serverError(_('Lost our file data.'));
-            return;
         }
 
         // If image is not being cropped assume pos & dimentions of original