Merge "Do not support new installations via .php5 entrypoint any longer"

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

diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 73b6ea7..827a573 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -34,7 +34,7 @@ class ResourceLoaderLanguageNamesModule extends ResourceLoaderModule {
 
 
        /**
-        * @param $context ResourceLoaderContext
+        * @param ResourceLoaderContext $context
         * @return array
         */
        protected function getData( ResourceLoaderContext $context ) {
@@ -45,27 +45,27 @@ class ResourceLoaderLanguageNamesModule extends ResourceLoaderModule {
        }
 
        /**
-        * @param $context ResourceLoaderContext
+        * @param ResourceLoaderContext $context
         * @return string JavaScript code
         */
        public function getScript( ResourceLoaderContext $context ) {
-               return Xml::encodeJsCall( 'mw.language.setData', array(
-                       $context->getLanguage(),
-                       'languageNames',
-                       $this->getData( $context )
-               ) );
-       }
-
-       public function getDependencies() {
-               return array( 'mediawiki.language.init' );
+               return Xml::encodeJsCall(
+                       'mw.language.setData',
+                       array(
+                               $context->getLanguage(),
+                               'languageNames',
+                               $this->getData( $context )
+                       ),
+                       ResourceLoader::inDebugMode()
+               );
        }
 
        /**
         * @param ResourceLoaderContext $context
-        * @return int UNIX timestamp
+        * @return array
         */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               return max( 1, $this->getHashMtime( $context ) );
+       public function getDependencies( ResourceLoaderContext $context = null ) {
+               return array( 'mediawiki.language.init' );
        }
 
        /**