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 "Hygiene: use null-coalescing operator when operating on tags"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderModule.php
diff --git
a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index
aed036b
..
eb174f0
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderModule.php
+++ b/
includes/resourceloader/ResourceLoaderModule.php
@@
-943,7
+943,7
@@
abstract class ResourceLoaderModule implements LoggerAwareInterface {
if ( !$this->getConfig()->get( 'ResourceLoaderValidateJS' ) ) {
return $contents;
}
if ( !$this->getConfig()->get( 'ResourceLoaderValidateJS' ) ) {
return $contents;
}
- $cache =
ObjectCache::getMainWANInstanc
e();
+ $cache =
MediaWikiServices::getInstance()->getMainWANObjectCach
e();
return $cache->getWithSetCallback(
$cache->makeGlobalKey(
'resourceloader',
return $cache->getWithSetCallback(
$cache->makeGlobalKey(
'resourceloader',