phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[6344] trunk/lib/plugin/Transclude.php

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

Revision: 6344
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6344&view=rev
Author:   vargenau
Date:     2008-11-07 14:20:31 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
No div needed

Modified Paths:
--------------
    trunk/lib/plugin/Transclude.php

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2008-11-07 14:12:27 UTC (rev 6343)
+++ trunk/lib/plugin/Transclude.php	2008-11-07 14:20:31 UTC (rev 6344)
@@ -110,7 +110,7 @@
         $noframe_msg = HTML::div(array('class' => 'transclusion'),
                                  HTML::p(array(), $noframe_msg));
 
-        $iframe = HTML::div(HTML::iframe($params, $noframe_msg));
+        $iframe = HTML::iframe($params, $noframe_msg);
 
         /* This doesn't work very well...  maybe because CSS screws up NS4 anyway...
         $iframe = new HtmlElement('ilayer', array('src' => $src), $iframe);


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

[phpwiki-checkins] SF.net SVN: phpwiki:[10721] trunk/lib/plugin/Transclude.php

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

Revision: 10721
          http://sourceforge.net/p/phpwiki/code/10721
Author:   vargenau
Date:     2021-12-02 11:29:09 +0000 (Thu, 02 Dec 2021)
Log Message:
-----------
Transclude plugin: test argument quiet is a boolean

Modified Paths:
--------------
    trunk/lib/plugin/Transclude.php

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2021-12-02 11:09:30 UTC (rev 10720)
+++ trunk/lib/plugin/Transclude.php	2021-12-02 11:29:09 UTC (rev 10721)
@@ -74,9 +74,20 @@
         $args = ($this->getArgs($argstr, $request));
         extract($args);
 
-        if (!$src) {
+        if (!is_bool($quiet)) {
+            if (($quiet == '0') || ($quiet == 'false')) {
+                $quiet = false;
+            } elseif (($quiet == '1') || ($quiet == 'true')) {
+                $quiet = true;
+            } else {
+                return $this->error(sprintf(_("Argument '%s' must be a boolean"), "quiet"));
+            }
+        }
+
+        if (empty($src)) {
             return $this->error(fmt("%s parameter missing", "'src'"));
         }
+
         // Expand possible interwiki link for src
         if (strstr($src, ':')
             and (!strstr($src, '://'))

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