Merge branch 'nightly' into '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..06c80b8abf36ed1a5d913f8f771fef0fd8ff64f6 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');