Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / GNUsocialVideo / actions / showvideo.php

diff --git a/plugins/GNUsocialVideo/actions/showvideo.php b/plugins/GNUsocialVideo/actions/showvideo.php
index 628d08642af2147cb064ec2c78bdd5e9bf3ebaaa..5021c19c9953fc723ce0b561b23b200581e85580 100644 (file)
--- a/plugins/GNUsocialVideo/actions/showvideo.php
+++ b/plugins/GNUsocialVideo/actions/showvideo.php
@@ -34,7 +34,7 @@ class ShowvideoAction extends ShownoticeAction
     protected $id = null;
     protected $vid = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         OwnerDesignAction::prepare($args);
         $this->id = $this->trimmed('id');