jenkins-bot has submitted this change and it was merged.
Change subject: Remove call to wfArrayMerge
......................................................................
Remove call to wfArrayMerge
wfArrayMerge is deprecated as of MediaWiki 1.22 in I2c6844fc.
Change-Id: Idece55629421c077d3fc2ae0a4997f7dea8cdd9d
---
M ffs/MediaWikiComplexMessages.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ffs/MediaWikiComplexMessages.php b/ffs/MediaWikiComplexMessages.php
index 2fede42..1f41dfe 100644
--- a/ffs/MediaWikiComplexMessages.php
+++ b/ffs/MediaWikiComplexMessages.php
@@ -99,7 +99,7 @@
$defs = $this->readVariable( $group, 'en' );
$code = $this->language;
- $current = wfArrayMerge( $this->readVariable( $group, $code ),
$savedData );
+ $current = $savedData + $this->readVariable( $group, $code );
// Clean up duplicates to definitions from saved data
$current = $this->cleanData( $defs, $current );
--
To view, visit https://gerrit.wikimedia.org/r/72237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idece55629421c077d3fc2ae0a4997f7dea8cdd9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
