Protect cdata

Author: akirk

includes/class-hashtag.php

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

includes/class-mention.php

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

tests/test-class-activitypub-hashtag.php

@@ -19,7 +19,7 @@ public function the_content_provider() {
 		$code = '<code>text with some #object and <a> tag inside</code>';
 		$style = <<<ENDSTYLE
 <style type="text/css">
-<![[
+<![CDATA[
 color: #ccc;
 ]]>
 </style>