Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 8c88d4cd6931f73c40c03cfc24e15c491f221444..1bb830f81eb38821b203466ae7c70dd37bf6b151 100644 (file)
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -54,7 +54,7 @@ class MakeadminAction extends RedirectingAction
      * @return boolean success flag
      */
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
         if (!common_logged_in()) {