Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / SlicedFavorites / actions / favoritedslice.php

diff --git a/plugins/SlicedFavorites/actions/favoritedslice.php b/plugins/SlicedFavorites/actions/favoritedslice.php
index bf4242d096586bdb9b2331015ed8e3c11b1f4982..285bfbbc67cd06a4376cbd5ed90565f8565302ed 100644 (file)
--- a/plugins/SlicedFavorites/actions/favoritedslice.php
+++ b/plugins/SlicedFavorites/actions/favoritedslice.php
@@ -45,7 +45,7 @@ class FavoritedSliceAction extends FavoritedAction
      *
      * @todo move queries from showContent() to here
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);