From: <rob...@us...> - 2012-06-22 18:04:58
|
Revision: 42033 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42033&view=rev Author: robertplummer Date: 2012-06-22 18:04:52 +0000 (Fri, 22 Jun 2012) Log Message: ----------- [FIX] Suppress warnings for class_exists by using @, found a few places where other warnings could be resolved. Modified Paths: -------------- trunk/lib/core/JisonParser/Wiki/Handler.php Modified: trunk/lib/core/JisonParser/Wiki/Handler.php =================================================================== --- trunk/lib/core/JisonParser/Wiki/Handler.php 2012-06-22 18:02:48 UTC (rev 42032) +++ trunk/lib/core/JisonParser/Wiki/Handler.php 2012-06-22 18:04:52 UTC (rev 42033) @@ -27,7 +27,7 @@ /* header tracking */ var $headerStack = array(); var $headerCount = 0; - var $headerIdCount = 0; + var $headerIdCount = array(); //This var is used in both protectSpecialChars and unprotectSpecialChars to simplify the html ouput process var $specialChars = array( @@ -57,6 +57,7 @@ var $prefs; var $page; + var $isHtmlPurifying = false; public static $option = array(); var $optionDefaults = array( @@ -292,13 +293,13 @@ function pluginExecute($name, $args = array(), $body = "", $key) { $name = strtolower($name); - if (!isset(self::$pluginsExecutedStack[$name])) { - self::$pluginsExecutedStack[$name] == 0; + if (isset(self::$pluginsExecutedStack[$name]) == false) { + self::$pluginsExecutedStack[$name] = 0; } self::$pluginsExecutedStack[$name]++; $className = 'WikiPlugin_' . $name; - if (class_exists($className)) { + if (@class_exists($className)) { $class = new $className; if (isset($class->parserLevel) && $class->parserLevel > $this->parserLevel) { if(!isset($this->pluginsAwaitingExecution[$class->parserLevel])) $this->pluginsAwaitingExecution[$class->parserLevel] = array(); @@ -461,7 +462,7 @@ } $className = 'WikiPlugin_' . $name; - if (class_exists($className)) { + if (@class_exists($className)) { $known[$name] = true; } @@ -631,12 +632,21 @@ } } - function checkToSkipLine(&$skipLine, &$lineInLowerCase, $key, $start, $stop, $skipBefore = false, $skipAfter = false) + function checkToSkipLine(&$skipLine, &$lineInLowerCase, $key, $start = "", $stop = "", $skipBefore = false, $skipAfter = false) { // check if we are inside a script not insert <br /> - $opens = substr_count($lineInLowerCase, $start); - $closes = substr_count($lineInLowerCase, $stop); + $opens = -1; + if (empty($start) == false) { + $opens = substr_count($lineInLowerCase, $start); + } + $closes = -1; + if (empty($stop) == false) { + $closes = substr_count($lineInLowerCase, $stop); + } + + if ($opens < 0 && $closes < 0) return; + $this->parseBreaksTracking[$key] += $opens; $this->parseBreaksTracking[$key] -= $closes; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |