(An Untitled Masterwork)
ActivePublic
Actions

Authored by Arlolra on Mar 27 2023, 9:39 PM.

Tags

None

Referenced Files

	F36930390: raw-paste-data.txt
	Mar 27 2023, 9:39 PM

Subscribers

None

	diff --git a/src/Ext/Cite/References.php b/src/Ext/Cite/References.php
	index df300e0fd..8153e65bd 100644
	--- a/src/Ext/Cite/References.php
	+++ b/src/Ext/Cite/References.php
	@@ -316,6 +316,8 @@ class References extends ExtensionTagHandler {
	// FIXME: See T260082 for a more complete description of cause and deeper fix
	$missingContent = ( !empty( $cDp->empty ) \|\| trim( $refDmw->body->extsrc ?? '' ) === '' );

	+ $dmw = $isTplWrapper ? $tplDmw : $refDmw;
	+
	if ( $missingContent ) {
	// Check for missing name and content to generate error code
	//
	@@ -334,12 +336,12 @@ class References extends ExtensionTagHandler {
	}

	if ( !empty( $cDp->selfClose ) ) {
	- unset( $refDmw->body );
	+ unset( $dmw->body );
	} else {
	// Empty the <sup> since we've serialized its children and
	// removing it below asserts everything has been migrated out
	DOMCompat::replaceChildren( $c );
	- $refDmw->body = (object)[ 'html' => $refDmw->body->extsrc ?? '' ];
	+ $dmw->body = (object)[ 'html' => $refDmw->body->extsrc ?? '' ];
	}
	} else {
	if ( $ref->contentId && !$validFollow ) {
	@@ -354,9 +356,9 @@ class References extends ExtensionTagHandler {
	'key' => 'cite_error_references_duplicate_key',
	'params' => [ $refDmw->attrs->name ]
	];
	- $refDmw->body = (object)[ 'html' => $html ];
	+ $dmw->body = (object)[ 'html' => $html ];
	} else {
	- $refDmw->body = (object)[ 'id' => 'mw-reference-text-' . $ref->target ];
	+ $dmw->body = (object)[ 'id' => 'mw-reference-text-' . $ref->target ];
	}
	}

	@@ -389,7 +391,6 @@ class References extends ExtensionTagHandler {
	}
	DOMDataUtils::setDataParsoid( $linkBack, $dataParsoid );

	- $dmw = $isTplWrapper ? $tplDmw : $refDmw;
	DOMDataUtils::setDataMw( $linkBack, $dmw );

	// FIXME(T214241): Should the errors be added to data-mw if

Event Timeline

Arlolra created this paste.Mar 27 2023, 9:39 PM

Arlolra mentioned this in T333162: Linter link-in-link error not reported when link is inside nested reference.Mar 27 2023, 9:58 PM

(An Untitled Masterwork)ActivePublicActions

Event Timeline

(An Untitled Masterwork)
ActivePublic
Actions