r82450 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r82449‎ | r82450 | r82451 >
Date:12:33, 19 February 2011
Author:catrope
Status:ok
Tags:
Comment:
1.17wmf1: MFT r82447, r82448
Modified paths:
  • /branches/wmf/1.17wmf1/extensions/LocalisationUpdate (modified) (history)
  • /branches/wmf/1.17wmf1/extensions/LocalisationUpdate/LocalisationUpdate.class.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/extensions/LocalisationUpdate/LocalisationUpdate.class.php
@@ -160,7 +160,7 @@
161161 closedir( $dir );
162162
163163 // Find the changed English strings (as these messages won't be updated in ANY language).
164 - $changedEnglishStrings = self::compareFiles( $localdir . '/MessagesEn.php', $svndir . '/MessagesEn.php', $verbose, true );
 164+ $changedEnglishStrings = self::compareFiles( $localdir . '/MessagesEn.php', $svndir . '/MessagesEn.php', $verbose );
165165
166166 // Count the changes.
167167 $changedCount = 0;
@@ -558,6 +558,9 @@
559559 continue;
560560 }
561561
 562+ if ( !isset( $compare_messages[$language] ) ) {
 563+ $compare_messages[$language] = array();
 564+ }
562565 // Add the already known messages to the array so we will only find new changes.
563566 $compare_messages[$language] = array_merge(
564567 $compare_messages[$language],
Property changes on: branches/wmf/1.17wmf1/extensions/LocalisationUpdate
___________________________________________________________________
Modified: svn:mergeinfo
565568 Merged /trunk/extensions/LocalisationUpdate:r82448

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r82447Partial revert of r54986: passing true for an array parameter that's type-hin...catrope12:05, 19 February 2011
r82448Shut up "Argument #1 to array_merge() is not an array" warnings in Localisati...catrope12:20, 19 February 2011

Status & tagging log