Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197909
Change subject: ChangeOpsMerge Case insensitive string check added
......................................................................
ChangeOpsMerge Case insensitive string check added
wbmergeitems adds alias when a duplicate label / alias already existed on target
item, therefore a case insensitive string comparison added to
generateLabelsChangeOps() for labels to avoid same labels with different case
Bug: T91327
Change-Id: I67f0294c3fa07a8df71cb485decc885ef7f24dd7
---
M repo/includes/ChangeOp/ChangeOpsMerge.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/09/197909/1
diff --git a/repo/includes/ChangeOp/ChangeOpsMerge.php
b/repo/includes/ChangeOp/ChangeOpsMerge.php
index 9aa152d..0ff160e 100644
--- a/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -165,7 +165,7 @@
private function generateLabelsChangeOps() {
foreach ( $this->fromItem->getLabels() as $langCode => $label )
{
$toLabel = $this->toItem->getLabel( $langCode );
- if ( $toLabel === false || $toLabel === $label ) {
+ if ( $toLabel === false || strcasecmp( $toLabel, $label
) == 0 ) {
$this->fromChangeOps->add(
$this->getFingerprintChangeOpFactory()->newRemoveLabelOp( $langCode ) );
$this->toChangeOps->add(
$this->getFingerprintChangeOpFactory()->newSetLabelOp( $langCode, $label ) );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/197909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67f0294c3fa07a8df71cb485decc885ef7f24dd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Sumit <asthana.sumi...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
