Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php
index 2be9187b9ea1cf732a685c4f50269fa316a62ee5..ae491bbe59e31673ec695789f0232a126e63c521 100644 (file)
--- a/actions/peopletagsubscriptions.php
+++ b/actions/peopletagsubscriptions.php
@@ -56,7 +56,7 @@ class PeopletagsubscriptionsAction extends Action
         }
     }
 
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);