From ecf558a18001d54e86c5fb464ed3a0756519d5ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 27 Nov 2013 15:20:28 +0100 Subject: [PATCH] Fix highlighting of quotes in XML highlighter --- .../bbcode/highlighter/XmlHighlighter.class.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/system/bbcode/highlighter/XmlHighlighter.class.php b/wcfsetup/install/files/lib/system/bbcode/highlighter/XmlHighlighter.class.php index 0a8ab5bb12..f016cf8881 100644 --- a/wcfsetup/install/files/lib/system/bbcode/highlighter/XmlHighlighter.class.php +++ b/wcfsetup/install/files/lib/system/bbcode/highlighter/XmlHighlighter.class.php @@ -75,16 +75,23 @@ class XmlHighlighter extends Highlighter { * @see \wcf\system\bbcode\highlighter\Highlighter::cacheQuotes() */ protected function cacheQuotes($string) { + $string = parent::cacheQuotes($string); + // highlight CDATA-Tags as quotes $string = Regex::compile('', Regex::DOT_ALL)->replace($string, new Callback(function (array $matches) { return StringStack::pushToStringStack(''.StringUtil::encodeHTML($matches[0]).'', 'highlighterQuotes'); })); - $string = parent::cacheQuotes($string); - return $string; } + /** + * @see \wcf\system\bbcode\highlighter\Highlighter::highlightQuotes() + */ + protected function highlightQuotes($string) { + return StringStack::reinsertStrings(parent::highlightQuotes($string), 'highlighterQuotes'); + } + /** * @see \wcf\system\bbcode\highlighter\Highlighter::highlightNumbers() */ -- 2.20.1