Merge "Call Skin::setRelevantUser on Special:UserRights"

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

diff --git a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
index d78fa9d..abcf9c6 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Resource loader module for default user preferences.
+ * ResourceLoader module for default user preferences.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,26 +26,13 @@
  */
 class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule {
 
-       /* Protected Members */
-
        protected $targets = array( 'desktop', 'mobile' );
 
-       /* Methods */
-
-       /**
-        * @param ResourceLoaderContext $context
-        * @return string Hash
-        */
-       public function getModifiedHash( ResourceLoaderContext $context ) {
-               return md5( serialize( User::getDefaultOptions() ) );
-       }
-
        /**
-        * @param ResourceLoaderContext $context
-        * @return int
+        * @return bool
         */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               return $this->getHashMtime( $context );
+       public function enableModuleContentVersion() {
+               return true;
        }
 
        /**
@@ -53,6 +40,10 @@ class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule {
         * @return string
         */
        public function getScript( ResourceLoaderContext $context ) {
-               return Xml::encodeJsCall( 'mw.user.options.set', array( User::getDefaultOptions() ) );
+               return Xml::encodeJsCall(
+                       'mw.user.options.set',
+                       array( User::getDefaultOptions() ),
+                       ResourceLoader::inDebugMode()
+               );
        }
 }