http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89008
Revision: 89008
Author: catrope
Date: 2011-05-27 22:55:21 +0000 (Fri, 27 May 2011)
Log Message:
-----------
1.17wmf1: MFT r89001 (already deployed)
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/MessageBlobStore.php
Property Changed:
----------------
branches/wmf/1.17wmf1/includes/MessageBlobStore.php
Modified: branches/wmf/1.17wmf1/includes/MessageBlobStore.php
===================================================================
--- branches/wmf/1.17wmf1/includes/MessageBlobStore.php 2011-05-27 22:45:51 UTC
(rev 89007)
+++ branches/wmf/1.17wmf1/includes/MessageBlobStore.php 2011-05-27 22:55:21 UTC
(rev 89008)
@@ -343,7 +343,7 @@
}
// Update the module's blobs if the set of messages
changed or if the blob is
// older than $wgCacheEpoch
- if ( array_keys( FormatJson::decode( $row->mr_blob,
true ) ) !== $module->getMessages() ||
+ if ( array_keys( FormatJson::decode( $row->mr_blob,
true ) ) !== array_values( array_unique( $module->getMessages() ) ) ||
wfTimestamp( TS_MW, $row->mr_timestamp
) <= $wgCacheEpoch ) {
$retval[$row->mr_resource] =
self::updateModule( $row->mr_resource, $module, $lang );
} else {
Property changes on: branches/wmf/1.17wmf1/includes/MessageBlobStore.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/MessageBlobStore.php:51646
/branches/new-installer/phase3/includes/MessageBlobStore.php:43664-66004
/branches/sqlite/includes/MessageBlobStore.php:58211-58321
/branches/wmf/1.16wmf4/includes/MessageBlobStore.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/MessageBlobStore.php:53381,60970
/trunk/phase3/includes/MessageBlobStore.php:79722,79732
+ /branches/REL1_15/phase3/includes/MessageBlobStore.php:51646
/branches/new-installer/phase3/includes/MessageBlobStore.php:43664-66004
/branches/sqlite/includes/MessageBlobStore.php:58211-58321
/branches/wmf/1.16wmf4/includes/MessageBlobStore.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/MessageBlobStore.php:53381,60970
/trunk/phase3/includes/MessageBlobStore.php:79722,79732,89001
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
