Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / lib / adminpanelaction.php

diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 4868e9d492de116af2ba5b785f1185d7af17ca3c..af6e11a511487805f7c5aaf337c584f2d270fcd4 100644 (file)
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -60,7 +60,7 @@ class AdminPanelAction extends Action
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -69,7 +69,6 @@ class AdminPanelAction extends Action
         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 false;
         }
 
         $user = common_current_user();
@@ -94,7 +93,6 @@ class AdminPanelAction extends Action
         if (!$user->hasRight(Right::CONFIGURESITE)) {
             // TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
             $this->clientError(_('You cannot make changes to this site.'));
-            return false;
         }
 
         // This panel must be enabled
@@ -106,7 +104,6 @@ class AdminPanelAction extends Action
         if (!self::canAdmin($name)) {
             // TRANS: Client error message throw when a certain panel's settings cannot be changed.
             $this->clientError(_('Changes to that panel are not allowed.'), 403);
-            return false;
         }
 
         return true;
@@ -122,7 +119,7 @@ class AdminPanelAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkSessionToken();
@@ -220,7 +217,6 @@ class AdminPanelAction extends Action
     {
         // TRANS: Client error message.
         $this->clientError(_('showForm() not implemented.'));
-        return;
     }
 
     /**
@@ -248,7 +244,6 @@ class AdminPanelAction extends Action
     {
         // TRANS: Client error message
         $this->clientError(_('saveSettings() not implemented.'));
-        return;
     }
 
     function canAdmin($name)