fix: RemexCompatFormatter: Don't encode HTML entities in raw-text elements

StarHeartHunt · StarHeartHunt · commit fa4fe0084369 · 2025-10-19T17:02:13.000+08:00
wikimedia@fc5f211
diff --git a/includes/tidy/RemexCompatFormatter.php b/includes/tidy/RemexCompatFormatter.php
@@ -56,10 +56,11 @@ public function characters( SerializerNode $parent, $text, $start, $length ) {
 			if ( $this->textProcessor !== null ) {
 				$text = call_user_func( $this->textProcessor, $text );
 			}
+
+			// Ensure a consistent representation for all entities
+			$text = Sanitizer::normalizeCharReferences( $text );
 		}
 
-		// Ensure a consistent representation for all entities
-		$text = Sanitizer::normalizeCharReferences( $text );
 		return $text;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,11 @@ public function characters( SerializerNode $parent, $text, $start, $length ) {`
`56`	`56`	`if ( $this->textProcessor !== null ) {`
`57`	`57`	`$text = call_user_func( $this->textProcessor, $text );`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ // Ensure a consistent representation for all entities`
	`61`	`+ $text = Sanitizer::normalizeCharReferences( $text );`
`59`	`62`	`}`
`60`	`63`
`61`		`- // Ensure a consistent representation for all entities`
`62`		`- $text = Sanitizer::normalizeCharReferences( $text );`
`63`	`64`	`return $text;`
`64`	`65`	`}`
`65`	`66`