Nicht doppelt encoden

youthweb · Sep 6, 2016 · 631dcfb · 631dcfb
1 parent e3e7d60
commit 631dcfb
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/src/Definition/Code.php b/src/Definition/Code.php
@@ -41,7 +41,11 @@ public function asHtml(ElementNode $el)
 			$content .= $child->getAsHTML();
 		}
 
-		return '<!-- no_p --><pre><code>' . htmlspecialchars($content) . '</code></pre><!-- no_p -->';
+		$flags = ENT_COMPAT | ENT_HTML401;
+		$encoding = ini_get("default_charset");
+		$double_encode = false; // Do not double encode
+
+		return '<!-- no_p --><pre><code>' . htmlspecialchars($content, $flags, $encoding, $double_encode) . '</code></pre><!-- no_p -->';
 	}
 
 }
diff --git a/src/Definition/Noparse.php b/src/Definition/Noparse.php
@@ -41,7 +41,11 @@ public function asHtml(ElementNode $el)
 			$content .= $child->getAsHTML();
 		}
 
-		return htmlspecialchars($content);
+		$flags = ENT_COMPAT | ENT_HTML401;
+		$encoding = ini_get("default_charset");
+		$double_encode = false; // Do not double encode
+
+		return htmlspecialchars($content, $flags, $encoding, $double_encode);
 	}
 
 }
diff --git a/tests/integration/ParsingTest.php b/tests/integration/ParsingTest.php
@@ -99,6 +99,12 @@ public function providerParseBBCode()
 				[],
 				'<pre><code>&lt;h7&gt;Header 7&lt;/h7&gt;</code></pre>',
 			],
+			// Do not double encode
+			[
+				'[code]&lt;h7&gt;Header 7&lt;/h7&gt;[/code]',
+				[],
+				'<pre><code>&lt;h7&gt;Header 7&lt;/h7&gt;</code></pre>',
+			],
 			[
 				'[code]
 Durchmesser der Erde:    D  = 12742 km = 12742000 m
@@ -144,6 +150,12 @@ public function providerParseBBCode()
 				[],
 				'<p>&lt;h7&gt;Header 7&lt;/h7&gt;</p>',
 			],
+			// Do not double encode
+			[
+				'[noparse]&lt;h7&gt;Header 7&lt;/h7&gt;[/noparse]',
+				[],
+				'<p>&lt;h7&gt;Header 7&lt;/h7&gt;</p>',
+			],
 			// Urls
 			[
 				'example.org',

diff --git a/tests/unit/Definition/CodeTest.php b/tests/unit/Definition/CodeTest.php
@@ -34,6 +34,12 @@ public function dataProvider()
 				null,
 				'<!-- no_p --><pre><code>&lt;span style=&quot;color:Red;&quot;&gt;some text mit Umlauten äöü&lt;/span&gt;</code></pre><!-- no_p -->',
 			],
+			// Do not double encode
+			[
+				'&lt;span style=&quot;color:Red;&quot;&gt;some text mit Umlauten äöü&lt;/span&gt;',
+				null,
+				'<!-- no_p --><pre><code>&lt;span style=&quot;color:Red;&quot;&gt;some text mit Umlauten äöü&lt;/span&gt;</code></pre><!-- no_p -->',
+			],
 			[
 				'',
 				null,

diff --git a/tests/unit/Definition/NoparseTest.php b/tests/unit/Definition/NoparseTest.php
@@ -39,6 +39,12 @@ public function dataProvider()
 				null,
 				'',
 			],
+			// Do not double encode
+			[
+				'&lt;h7&gt;Header 7&lt;/h7&gt;',
+				[],
+				'&lt;h7&gt;Header 7&lt;/h7&gt;',
+			],
 		];
 	}
 }