From: <sy...@us...> - 2008-09-28 21:15:52
|
Revision: 14881 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14881&view=rev Author: sylvieg Date: 2008-09-28 21:15:42 +0000 (Sun, 28 Sep 2008) Log Message: ----------- notice Modified Paths: -------------- trunk/lib/tikilib.php trunk/lib/wiki/renderlib.php Modified: trunk/lib/tikilib.php =================================================================== --- trunk/lib/tikilib.php 2008-09-28 06:10:00 UTC (rev 14880) +++ trunk/lib/tikilib.php 2008-09-28 21:15:42 UTC (rev 14881) @@ -5101,7 +5101,7 @@ // print "<pre>pos's: :$pos, $pos_middle:</pre>"; // process "short" plugins here: {plugin par1=>val1} - melmut - if( $plugins['type'] == 'short' && preg_match("/ *\}$/",$plugin_start) ) { + if( isset($plugins['type']) && $plugins['type'] == 'short' && preg_match("/ *\}$/",$plugin_start) ) { $plugin_end=''; $pos_end = $pos + strlen($plugin_start); // process "short" plugins here: {PLUGIN(par1=>val1)/} - melmut Modified: trunk/lib/wiki/renderlib.php =================================================================== --- trunk/lib/wiki/renderlib.php 2008-09-28 06:10:00 UTC (rev 14880) +++ trunk/lib/wiki/renderlib.php 2008-09-28 21:15:42 UTC (rev 14881) @@ -549,7 +549,7 @@ private function setGlobal( $name, $value ) // {{{ { - if( $GLOBALS[$name] != $value && ! array_key_exists( $name, $this->toRestore ) ) + if( (empty($GLOBALS[$name]) || $GLOBALS[$name] != $value) && ! array_key_exists( $name, $this->toRestore ) ) $this->toRestore[$name] = $value; $GLOBALS[$name] = $value; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |