https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113278

Revision: 113278
Author:   catrope
Date:     2012-03-07 19:36:40 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
1.19wmf1: MFT r113277

Modified Paths:
--------------
    branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderModule.php
    branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderWikiModule.php

Modified: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderModule.php
===================================================================
--- branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderModule.php      
2012-03-07 19:33:37 UTC (rev 113277)
+++ branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderModule.php      
2012-03-07 19:36:40 UTC (rev 113278)
@@ -357,6 +357,10 @@
         * timestamps. Whenever anything happens that changes the module's
         * contents for these parameters, the mtime should increase.
         *
+        * NOTE: The mtime of the module's messages is NOT automatically 
included.
+        * If you want this to happen, you'll need to call getMsgBlobMtime()
+        * yourself and take its result into consideration.
+        * 
         * @param $context ResourceLoaderContext: Context object
         * @return Integer: UNIX timestamp
         */

Modified: 
branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderWikiModule.php
===================================================================
--- branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderWikiModule.php  
2012-03-07 19:33:37 UTC (rev 113277)
+++ branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderWikiModule.php  
2012-03-07 19:36:40 UTC (rev 113278)
@@ -157,6 +157,7 @@
                if ( count( $mtimes ) ) {
                        $modifiedTime = max( $modifiedTime, max( $mtimes ) );
                }
+               $modifiedTime = max( $modifiedTime, $this->getMsgBlobMtime( 
$context->getLanguage() ) );
                return $modifiedTime;
        }
 


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to