Use ResourceLoader::makeComment to embed page title in wiki modules

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderWikiModule.php

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 3f10ae5..f275a6b 100644 (file)
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -125,10 +125,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
                        $script = $this->getContent( $title );
                        if ( strval( $script ) !== '' ) {
                                $script = $this->validateScriptFile( $titleText, $script );
-                               if ( strpos( $titleText, '*/' ) === false ) {
-                                       $scripts .= "/* $titleText */\n";
-                               }
-                               $scripts .= $script . "\n";
+                               $scripts .= ResourceLoader::makeComment( $titleText ) . $script . "\n";
                        }
                }
                return $scripts;
@@ -162,9 +159,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
                        if ( !isset( $styles[$media] ) ) {
                                $styles[$media] = array();
                        }
-                       if ( strpos( $titleText, '*/' ) === false ) {
-                               $style = "/* $titleText */\n" . $style;
-                       }
+                       $style = ResourceLoader::makeComment( $titleText ) . $style;
                        $styles[$media][] = $style;
                }
                return $styles;
@@ -180,10 +175,26 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
                if ( count( $mtimes ) ) {
                        $modifiedTime = max( $modifiedTime, max( $mtimes ) );
                }
-               $modifiedTime = max( $modifiedTime, $this->getMsgBlobMtime( $context->getLanguage() ) );
+               $modifiedTime = max(
+                       $modifiedTime,
+                       $this->getMsgBlobMtime( $context->getLanguage() ),
+                       $this->getDefinitionMtime( $context )
+               );
                return $modifiedTime;
        }
 
+       /**
+        * Get the definition summary for this module.
+        *
+        * @return Array
+        */
+       public function getDefinitionSummary( ResourceLoaderContext $context ) {
+               return array(
+                       'class' => get_class( $this ),
+                       'pages' => $this->getPages( $context ),
+               );
+       }
+
        /**
         * @param $context ResourceLoaderContext
         * @return bool