From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 26 Sep 2016 14:54:41 +0000 (+0200)
Subject: Fixed code bbcodes evaluated inside code HTML tags
X-Git-Tag: 3.0.0_Beta_2~117
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=678b38b803ef5d4b3d77b90197edd236ee79f59b;p=GitHub%2FWoltLab%2FWCF.git

Fixed code bbcodes evaluated inside code HTML tags
---

diff --git a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeWoltlabMetacodeMarker.class.php b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeWoltlabMetacodeMarker.class.php
index 575a6860d0..6e3468c97d 100644
--- a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeWoltlabMetacodeMarker.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeWoltlabMetacodeMarker.class.php
@@ -79,30 +79,11 @@ class HtmlInputNodeWoltlabMetacodeMarker extends AbstractHtmlInputNode {
 	 * @return      array                           filtered groups without source bbcodes
 	 */
 	protected function revertMarkerInsideCodeBlocks(array $groups, AbstractHtmlNodeProcessor $htmlNodeProcessor) {
-		$isInsideCode = function(\DOMElement $element) {
-			$parent = $element;
-			while ($parent = $parent->parentNode) {
-				$nodeName = $parent->nodeName;
-				
-				if ($nodeName === 'code' || $nodeName === 'kbd' || $nodeName === 'pre') {
-					return true;
-				}
-				else if ($nodeName === 'woltlab-metacode') {
-					$name = $parent->getAttribute('data-name');
-					if ($name === 'code' || $name === 'tt') {
-						return true;
-					}
-				}
-			}
-			
-			return false;
-		};
-		
 		foreach ($groups as $name => $pairs) {
 			$needsReindex = false;
 			for ($i = 0, $length = count($pairs); $i < $length; $i++) {
 				$pair = $pairs[$i];
-				if ($isInsideCode($pair['open']) || $isInsideCode($pair['close'])) {
+				if ($this->isInsideCode($pair['open']) || $this->isInsideCode($pair['close'])) {
 					$pair['attributes'] = $htmlNodeProcessor->parseAttributes($pair['attributes']);
 					$this->convertToBBCode($name, $pair);
 					
@@ -124,6 +105,25 @@ class HtmlInputNodeWoltlabMetacodeMarker extends AbstractHtmlInputNode {
 		return $groups;
 	}
 	
+	protected function isInsideCode(\DOMElement $element) {
+		$parent = $element;
+		while ($parent = $parent->parentNode) {
+			$nodeName = $parent->nodeName;
+			
+			if ($nodeName === 'code' || $nodeName === 'kbd' || $nodeName === 'pre') {
+				return true;
+			}
+			else if ($nodeName === 'woltlab-metacode') {
+				$name = $parent->getAttribute('data-name');
+				if ($name === 'code' || $name === 'tt') {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
 	/**
 	 * Builds the list of paired bbcode markers.
 	 * 
@@ -222,25 +222,31 @@ class HtmlInputNodeWoltlabMetacodeMarker extends AbstractHtmlInputNode {
 	 */
 	protected function convertSourceGroups(array $groups) {
 		foreach ($this->sourceElements as $name) {
-			if (in_array($name, $this->blockElements)) {
-				if (isset($groups[$name])) {
-					for ($i = 0, $length = count($groups[$name]); $i < $length; $i++) {
-						$data = $groups[$name][$i];
-						$this->convertBlockElement($name, $data['open'], $data['close'], $data['attributes']);
-					}
-					
-					unset($groups[$name]);
+			if (!isset($groups[$name])) {
+				continue;
+			}
+			
+			for ($i = 0, $length = count($groups[$name]); $i < $length; $i++) {
+				$data = $groups[$name][$i];
+				if ($this->isInsideCode($data['open']) || $this->isInsideCode($data['close'])) {
+					continue;
 				}
+				
+				if (in_array($name, $this->blockElements)) {
+					$this->convertBlockElement($name, $data['open'], $data['close'], $data['attributes']);
+				}
+				else {
+					$this->convertInlineElement($name, $data['open'], $data['close'], $data['attributes']);
+				}
+				
+				unset($groups[$name][$i]);
+			}
+			
+			if (empty($groups[$name])) {
+				unset($groups[$name]);
 			}
 			else {
-				if (isset($groups[$name])) {
-					for ($i = 0, $length = count($groups[$name]); $i < $length; $i++) {
-						$data = $groups[$name][$i];
-						$this->convertInlineElement($name, $data['open'], $data['close'], $data['attributes']);
-					}
-					
-					unset($groups[$name]);
-				}
+				$groups[$name] = array_values($groups[$name]);
 			}
 		}