wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-09-25 11:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Unstrip <ref> contents before comparing"

Browse source
This commit is contained in:
jenkins-bot 2018-10-15 16:25:42 +00:00 committed by Gerrit Code Review
parent a08297ee92 b8efcb0e1a
commit 7d7756e53f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/Cite.php
View file

@ -380,7 +380,7 @@ class Cite {
# we'll figure that out later. Likewise it's definitely valid # we'll figure that out later. Likewise it's definitely valid
# if there's any content, regardless of key. # if there's any content, regardless of key.
return $this->stack( $str, $key, $group, $follow, $argv, $dir ); return $this->stack( $str, $key, $group, $follow, $argv, $dir, $parser );
} }
# Not clear how we could get here, but something is probably # Not clear how we could get here, but something is probably
@ -465,12 +465,13 @@ class Cite {
* @param string $group * @param string $group
* @param string|null $follow * @param string|null $follow
* @param string[] $call * @param string[] $call
* @param $dir ref direction * @param string $dir ref direction
* @param Parser $parser
* *
* @throws Exception * @throws Exception
* @return string * @return string
*/ */
private function stack( $str, $key, $group, $follow, array $call, $dir ) { private function stack( $str, $key, $group, $follow, array $call, $dir, Parser $parser ) {
if ( !isset( $this->mRefs[$group] ) ) { if ( !isset( $this->mRefs[$group] ) ) {
$this->mRefs[$group] = []; $this->mRefs[$group] = [];
} }
@ -551,7 +552,11 @@ class Cite {
$this->mRefCallStack[] = [ 'assign', $call, $str, $key, $group, $this->mRefCallStack[] = [ 'assign', $call, $str, $key, $group,
$this->mRefs[$group][$key]['key'] ]; $this->mRefs[$group][$key]['key'] ];
} else { } else {
if ( $str != null && $str !== '' && $str !== $this->mRefs[$group][$key]['text'] ) { if ( $str != null && $str !== ''
// T205803 different strip markers might hide the same text
&& $parser->mStripState->unstripBoth( $str )
!== $parser->mStripState->unstripBoth( $this->mRefs[$group][$key]['text'] )
) {
// two refs with same key and different content // two refs with same key and different content
// add error message to the original ref // add error message to the original ref
$this->mRefs[$group][$key]['text'] .= ' ' . $this->plainError( $this->mRefs[$group][$key]['text'] .= ' ' . $this->plainError(