diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /load.php | |
parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'load.php')
-rw-r--r-- | load.php | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -22,6 +22,8 @@ * @author Trevor Parscal */ +use MediaWiki\Logger\LoggerFactory; + // Bail on old versions of PHP, or if composer has not been run yet to install // dependencies. Using dirname( __FILE__ ) here because __DIR__ is PHP5.3+. require_once dirname( __FILE__ ) . '/includes/PHPVersionCheck.php'; @@ -38,12 +40,13 @@ if ( !$wgRequest->checkUrlExtension() ) { // Respond to resource loading request. // foo()->bar() syntax is not supported in PHP4, and this file needs to *parse* in PHP4. $configFactory = ConfigFactory::getDefaultInstance(); -$resourceLoader = new ResourceLoader( $configFactory->makeConfig( 'main' ) ); +$resourceLoader = new ResourceLoader( + $configFactory->makeConfig( 'main' ), + LoggerFactory::getInstance( 'resourceloader' ) +); $resourceLoader->respond( new ResourceLoaderContext( $resourceLoader, $wgRequest ) ); Profiler::instance()->setTemplated( true ); -wfLogProfilingData(); -// Shut down the database. -$lb = wfGetLBFactory(); -$lb->shutdown(); +$mediawiki = new MediaWiki(); +$mediawiki->doPostOutputShutdown( 'fast' ); |