dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Don't check namespace in SpecialWantedtemplates"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderUserDefaultsModule.php
diff --git
a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
index
1249cf8
..
eba61ed
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderUserDefaultsModule.php
+++ b/
includes/resourceloader/ResourceLoaderUserDefaultsModule.php
@@
-26,26
+26,13
@@
*/
class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule {
*/
class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule {
- /* Protected Members */
-
protected $targets = array( 'desktop', 'mobile' );
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 array|int|mixed
+ * @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 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()
+ );
}
}
}
}