From 4ecb32505225c25061113baabaccae66a8560ade Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Wed, 27 Nov 2024 17:04:56 +0000 Subject: [PATCH] Revert "Normalize ref html before comparison" This reverts commit 91316d49c248a32de9cb5dad67d8f52cf40094e3. Reason for revert: Caused T380977 when Remex was given math content to normalize. Change-Id: I6d7585a990322b5c8e2a6886b9cd05a556c501ad --- src/Parsoid/References.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Parsoid/References.php b/src/Parsoid/References.php index ec1bfaaf6..046316cbc 100644 --- a/src/Parsoid/References.php +++ b/src/Parsoid/References.php @@ -10,7 +10,6 @@ use Cite\Cite; use Cite\MarkSymbolRenderer; use Closure; use MediaWiki\Config\Config; -use MediaWiki\HtmlHelper; use MediaWiki\MediaWikiServices; use stdClass; use Wikimedia\Message\MessageValue; @@ -28,7 +27,6 @@ use Wikimedia\Parsoid\NodeData\DataMw; use Wikimedia\Parsoid\NodeData\DataMwError; use Wikimedia\Parsoid\NodeData\DataParsoid; use Wikimedia\Parsoid\Utils\DOMCompat; -use Wikimedia\RemexHtml\Serializer\SerializerNode; /** * @license GPL-2.0-or-later @@ -228,7 +226,7 @@ class References extends ExtensionTagHandler { // Ideally, we should strip the mw:Cite/Follow wrappers before comparing // But, we are going to ignore this edge case as not worth the complexity. $html = $extApi->domToHtml( $c, true, false ); - $contentDiffers = ( $this->normalizeRef( $html ) !== $this->normalizeRef( $ref->cachedHtml ) ); + $contentDiffers = ( $html !== $ref->cachedHtml ); } } else { if ( $refsData->inReferencesContent() ) { @@ -880,17 +878,4 @@ class References extends ExtensionTagHandler { return false; } - - private function normalizeRef( string $s ): string { - return HtmlHelper::modifyElements( $s, - static function ( SerializerNode $node ): bool { - return isset( $node->attrs['data-parsoid'] ) || isset( $node->attrs['about'] ); - }, - static function ( SerializerNode $node ): SerializerNode { - unset( $node->attrs['data-parsoid'] ); - unset( $node->attrs['about'] ); - return $node; - } - ); - } }