Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/subedit.php b/actions/subedit.php
index 9e779c4f0657c104d75c2b2843ac1993358b5c32..d6a0e9546887cf5b616e5dafd46383bf91eff4e1 100644 (file)
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -24,7 +24,7 @@ class SubeditAction extends Action
 {
     var $profile = null;
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);