[phpwiki-checkins] SF.net SVN: phpwiki:[9290] trunk/lib

[<var...@us...>]

Revision: 9290
          http://sourceforge.net/p/phpwiki/code/9290
Author:   vargenau
Date:     2014-11-09 17:21:10 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Type compatibility

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2014-11-08 16:21:41 UTC (rev 9289)
+++ trunk/lib/WikiPlugin.php	2014-11-09 17:21:10 UTC (rev 9290)
@@ -106,7 +106,7 @@
      * @param array $defaults
      * @return array
      */
-    function getArgs($argstr, $request = false, $defaults = array())
+    function getArgs($argstr, $request = null, $defaults = array())
     {
         if (empty($defaults)) {
             $defaults = $this->getDefaultArguments();

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2014-11-08 16:21:41 UTC (rev 9289)
+++ trunk/lib/WikiPluginCached.php	2014-11-09 17:21:10 UTC (rev 9290)
@@ -454,9 +454,10 @@
     </object>
      */
     // how to handle alternate images? always provide alternate static images?
-    function embedObject($url, $type, $args = false, $params = false)
+    function embedObject($url, $type, $args = array(), $params = false)
     {
-        if (!$args) $args = array();
+        if (empty($args))
+            $args = array();
         $object = HTML::object(array_merge($args, array('src' => $url, 'type' => $type)));
         if ($params)
             $object->pushContent($params);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.