ConversationTree is now a plugin (not oldschool setting)

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

diff --git a/actions/block.php b/actions/block.php
index e87353b4e13ce86096eabb79303fb7fca84aa900..7458caa6ac73200ea50e2be58c3fd97c2f9ac839 100644 (file)
--- a/actions/block.php
+++ b/actions/block.php
@@ -66,7 +66,6 @@ class BlockAction extends ProfileFormAction
         if ($cur->hasBlocked($this->profile)) {
             // TRANS: Client error displayed when blocking a user that has already been blocked.
             $this->clientError(_('You already blocked that user.'));
-            return false;
         }
 
         return true;
@@ -155,14 +154,14 @@ class BlockAction extends ProfileFormAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when blocking a user.
-                      _('Do not block this user'));
+                      _('Do not block this user.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the user block form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when blocking a user.
-                      _('Block this user'));
+                      _('Block this user.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -187,7 +186,6 @@ class BlockAction extends ProfileFormAction
         if (!$result) {
             // TRANS: Server error displayed when blocking a user fails.
             $this->serverError(_('Failed to save block information.'));
-            return;
         }
     }