From: Reini U. <ru...@us...> - 2004-02-27 02:30:43
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31433 Modified Files: BlockParser.php CachedMarkup.php Log Message: patch #889415 "problems with zero's in text" plus one minor fix by me Index: BlockParser.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/BlockParser.php,v retrieving revision 1.38 retrieving revision 1.39 diff -u -2 -b -p -d -r1.38 -r1.39 --- BlockParser.php 15 Feb 2004 21:34:22 -0000 1.38 +++ BlockParser.php 27 Feb 2004 02:22:21 -0000 1.39 @@ -363,5 +363,5 @@ class ParsedBlock extends Block_HtmlElem $this->_atSpace = $input->skipSpace(); - if (! ($line = $input->currentLine()) ) + if (($line = $input->currentLine()) === '') return false; @@ -380,4 +380,6 @@ class ParsedBlock extends Block_HtmlElem //$input->_debug('[', "_match failed"); } + if (!$line) + return false; trigger_error("Couldn't match block: '$line'", E_USER_NOTICE); Index: CachedMarkup.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/CachedMarkup.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -2 -b -p -d -r1.8 -r1.9 --- CachedMarkup.php 19 Feb 2004 21:54:17 -0000 1.8 +++ CachedMarkup.php 27 Feb 2004 02:22:21 -0000 1.9 @@ -26,5 +26,5 @@ class CacheableMarkup extends XmlContent $this->_content = array(); $this->_append($content); - if ($this->_buf) + if ($this->_buf != '') $this->_content[] = $this->_buf; unset($this->_buf); |