From: <jon...@us...> - 2012-04-27 21:27:09
|
Revision: 41145 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41145&view=rev Author: jonnybradley Date: 2012-04-27 21:27:02 +0000 (Fri, 27 Apr 2012) Log Message: ----------- [FIX] parser: Don't parse_htmlchar for "is_html" pages which was causing entities to be encoded (displayed as source) on wysiwyg preview (*seems* to have no effect on other cases but might need an extra !$options['preview_mode'] if so) Modified Paths: -------------- branches/9.x/lib/parser/parserlib.php Modified: branches/9.x/lib/parser/parserlib.php =================================================================== --- branches/9.x/lib/parser/parserlib.php 2012-04-27 21:05:15 UTC (rev 41144) +++ branches/9.x/lib/parser/parserlib.php 2012-04-27 21:27:02 UTC (rev 41145) @@ -1505,7 +1505,7 @@ // further changed by nkoth - why not parse in wysiwyg mode as well, otherwise it won't parse for display/preview? // must be done before color as we can have ~hs~~hs // jb 9.0 html entity fix - excluded not $options['is_html'] pages - if (!$simple_wiki) { + if (!$simple_wiki && !$options['is_html']) { $this->parse_htmlchar($data, $options); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |