wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-11-27 16:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Cite error for named refs that attempt to redefine the content

Browse source 
* named refs which attempt to redefine the content are flagged with
   an error, but not follow on named refs that leave content blank
   or repeats the original content.

 * Fixed cite tests affected by this change to include !! html/parsoid
   sections.

Change-Id: I6832603c523a0465a6cc08f68c9ca79499331cd7
This commit is contained in:
sbailey 2020-06-29 14:07:24 -07:00 committed by Arlo Breault
parent 47506af785
commit a2c63c2e5e
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Parsoid/References.php
View file

@ -154,13 +154,17 @@ class References extends ExtensionTagHandler {
$extApi, $group, $refName, $about, $nestedInReferences, $linkBack
);
$errs = [];
// Check for missing content
$missingContent = ( !empty( $cDp->empty ) || trim( $refDmw->body->extsrc ) === '' );
// Check for missing name and content to generate error code
$hasMissingNameAndContent = ( $refName === '' ) && $missingContent;
if ( $missingContent ) {
// Check for missing name and content to generate error code
if ( $refName === '' ) {
$errs[] = [ 'key' => 'cite_error_ref_no_input' ];
}
if ( !empty( $cDp->selfClose ) ) {
unset( $refDmw->body );
} else {
@ -177,6 +181,9 @@ class References extends ExtensionTagHandler {
$html = $extApi->domToHtml( $c, true, true );
$c = null; // $c is being release in the call above
$contentDiffers = $html !== $ref->cachedHtml;
if ( $contentDiffers ) {
$errs[] = [ 'key' => 'cite_error_references_duplicate_key' ];
}
}
if ( $contentDiffers ) {
$refDmw->body = (object)[ 'html' => $html ];
@ -195,7 +202,7 @@ class References extends ExtensionTagHandler {
]
);
DOMUtils::addTypeOf( $linkBack, 'mw:Extension/ref' );
if ( $hasMissingNameAndContent ) {
if ( count( $errs ) > 0 ) {
DOMUtils::addTypeOf( $linkBack, 'mw:Error' );
}
@ -212,10 +219,7 @@ class References extends ExtensionTagHandler {
DOMDataUtils::setDataParsoid( $linkBack, $dataParsoid );
$dmw = $isTplWrapper ? $tplDmw : $refDmw;
if ( $hasMissingNameAndContent ) {
$errs = [
[ 'key' => 'cite_error_ref_no_input' ],
];
if ( count( $errs ) > 0 ) {
if ( is_array( $dmw->errors ?? null ) ) {
$errs = array_merge( $dmw->errors, $errs );
}