(bug 35036) Wikipage-based ResourceLoader modules were not automatically purged as...

Also adding a documentation comment in ResourceLoaderModule to clarify that it is the subclass's responsibility to make sure message blob timestamps are taken into account

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 7e293de..d960c26 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -295,6 +295,8 @@ production.
   calling action=purge&forcelinkupdate.
 * (bug 34377) action=watch now parses messages using the correct title instead
   of "API".
+* (bug 35036) WikiLove messages were not automatically updated in JavaScript
+  after having been changed on-wiki due to a bug in core
 
 === Languages updated in 1.19 ===
 

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index 6db5fb6..1a232ec 100644 (file)
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -357,6 +357,10 @@ abstract class ResourceLoaderModule {
         * 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
         */

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index b137531..91a51f8 100644 (file)
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -157,6 +157,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
                if ( count( $mtimes ) ) {
                        $modifiedTime = max( $modifiedTime, max( $mtimes ) );
                }
+               $modifiedTime = max( $modifiedTime, $this->getMsgBlobMtime( $context->getLanguage() ) );
                return $modifiedTime;
        }