Merge branch 'doc-backup-restore-def-vals' into 'nightly'

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

diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 2ac92cb5c6522a38f8b6e6d789e9b21c20a0b890..36b697b302f27c7f6e9e5a5526a8a375368f3719 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);
 
@@ -119,7 +119,7 @@ class AdminPanelAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkSessionToken();
@@ -246,7 +246,7 @@ class AdminPanelAction extends Action
         $this->clientError(_('saveSettings() not implemented.'));
     }
 
-    function canAdmin($name)
+    static function canAdmin($name)
     {
         $isOK = false;