Also protect <pre>

Author: akirk

includes/class-hashtag.php

@@ -45,7 +45,7 @@ public static function insert_post( $id, $post ) {
 	public static function the_content( $the_content ) {
 		$protected_tags = array();
 		$the_content = preg_replace_callback(
-			'#<(code|textarea|style)\b[^>]*>.*?</\1[^>]*>#i',
+			'#<(pre|code|textarea|style)\b[^>]*>.*?</\1[^>]*>#is',
 			function( $m ) use ( &$protected_tags ) {
 				$c = count( $protected_tags );
 				$protect = '!#!#PROTECT' . $c . '#!#!';

includes/class-mention.php

@@ -25,7 +25,7 @@ public static function init() {
 	public static function the_content( $the_content ) {
 		$protected_tags = array();
 		$the_content = preg_replace_callback(
-			'#<(code|textarea|style)\b[^>]*>.*?</\1[^>]*>#i',
+			'#<(pre|code|textarea|style)\b[^>]*>.*?</\1[^>]*>#is',
 			function( $m ) use ( &$protected_tags ) {
 				$c = count( $protected_tags );
 				$protect = '!#!#PROTECT' . $c . '#!#!';

tests/test-class-activitypub-hashtag.php

@@ -5,6 +5,7 @@ class Test_Activitypub_Hashtag extends WP_UnitTestCase {
 	 */
 	public function test_the_content( $content, $content_with_hashtag ) {
 		\wp_create_term( 'object', 'post_tag' );
+		\wp_create_term( 'touch', 'post_tag' );
 		\wp_create_term( 'ccc', 'post_tag' );
 		$object = \get_term_by( 'name', 'object', 'post_tag' );
 		$link = \get_term_link( $object, 'post_tag' );
@@ -23,6 +24,12 @@ public function the_content_provider() {
 ]]>
 </style>
 ENDSTYLE;
+		$pre = <<<ENDPRE
+<pre>
+Please don't #touch
+  this.
+</pre>
+ENDPRE;
 		$textarea = '<textarea name="test" rows="20">color: #ccc</textarea>';
 		return array(
 			array( 'test', 'test' ),
@@ -40,6 +47,7 @@ public function the_content_provider() {
 			array( $code, $code ),
 			array( $style, $style ),
 			array( $textarea, $textarea ),
+			array( $pre, $pre ),
 		);
 	}
 }

tests/test-class-activitypub-mention.php

@@ -19,13 +19,20 @@ public function test_the_content( $content, $content_with_mention ) {
 
 	public function the_content_provider() {
 		$code = 'hallo <code>@[email protected]</code> test';
+		$pre = <<<ENDPRE
+<pre>
+Please don't mention @[email protected]
+  here.
+</pre>
+ENDPRE;
 		return array(
 			array( 'hallo @[email protected] test', 'hallo <a rel="mention" class="u-url mention" href="https://example.org/users/username">@<span>username</span></a> test' ),
 			array( 'hallo @[email protected] test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span></a> test' ),
 			array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span>@notiz.blog</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span>@notiz.blog</a> test' ),
 			array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@[email protected]</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@[email protected]</a> test' ),
 			array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/@pfefferle/">@[email protected]</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/@pfefferle/">@[email protected]</a> test' ),
 			array( $code, $code ),
+			array( $pre, $pre ),
 		);
 	}