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 "Tablesorter: Use localeCompare"
[lhc/web/wiklou.git]
/
load.php
diff --git
a/load.php
b/load.php
index
1997fe7
..
4d34e5d
100644
(file)
--- a/
load.php
+++ b/
load.php
@@
-22,7
+22,6
@@
* @author Trevor Parscal
*/
* @author Trevor Parscal
*/
-use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
// This endpoint is supposed to be independent of request cookies and other
use MediaWiki\MediaWikiServices;
// This endpoint is supposed to be independent of request cookies and other
@@
-40,11
+39,7
@@
if ( !$wgRequest->checkUrlExtension() ) {
// writes when getting database connections for ResourceLoader. (T192611)
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->disableChronologyProtection();
// writes when getting database connections for ResourceLoader. (T192611)
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->disableChronologyProtection();
-// Set up ResourceLoader
-$resourceLoader = new ResourceLoader(
- ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
- LoggerFactory::getInstance( 'resourceloader' )
-);
+$resourceLoader = MediaWikiServices::getInstance()->getResourceLoader();
$context = new ResourceLoaderContext( $resourceLoader, $wgRequest );
// Respond to ResourceLoader request
$context = new ResourceLoaderContext( $resourceLoader, $wgRequest );
// Respond to ResourceLoader request