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 "Add CollationFa"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderContext.php
diff --git
a/includes/resourceloader/ResourceLoaderContext.php
b/includes/resourceloader/ResourceLoaderContext.php
index
b17200f
..
a1a89cb
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderContext.php
+++ b/
includes/resourceloader/ResourceLoaderContext.php
@@
-23,6
+23,7
@@
*/
use MediaWiki\Logger\LoggerFactory;
*/
use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
/**
* Object passed around to modules which contains information about the state
/**
* Object passed around to modules which contains information about the state
@@
-137,7
+138,7
@@
class ResourceLoaderContext {
*/
public static function newDummyContext() {
return new self( new ResourceLoader(
*/
public static function newDummyContext() {
return new self( new ResourceLoader(
-
ConfigFactory::getDefaultInstance()->makeConfig( 'main'
),
+
MediaWikiServices::getInstance()->getMainConfig(
),
LoggerFactory::getInstance( 'resourceloader' )
), new FauxRequest( [] ) );
}
LoggerFactory::getInstance( 'resourceloader' )
), new FauxRequest( [] ) );
}