X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=blobdiff_plain;f=api.php;h=92127474fc4f02936404ae437e5aa5961dbd859d;hb=cbe67ce13bb846082c33e975f4c7e306aac506cd;hp=74ee775bbe9f8021b1f4e52370cea090c058d9ac;hpb=c931f6bca33b544ca6af73acaf241309b4b5a0fa;p=lhc%2Fweb%2Fwiklou.git

diff --git a/api.php b/api.php
index 74ee775bbe..92127474fc 100644
--- a/api.php
+++ b/api.php
@@ -30,6 +30,8 @@
  * @file
  */
 
+use MediaWiki\Logger\LegacyLogger;
+
 // So extensions (and other code) can check whether they're running in API mode
 define( 'MW_API', true );
 
@@ -42,7 +44,6 @@ if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3
 
 require __DIR__ . '/includes/WebStart.php';
 
-wfProfileIn( 'api.php' );
 $starttime = microtime( true );
 
 // URL safety checks
@@ -62,6 +63,10 @@ if ( !$wgEnableAPI ) {
 // In a perfect world this wouldn't be necessary
 $wgTitle = Title::makeTitle( NS_MAIN, 'API' );
 
+// RequestContext will read from $wgTitle, but it will also whine about it.
+// In a perfect world this wouldn't be necessary either.
+RequestContext::getMain()->setTitle( $wgTitle );
+
 try {
 	/* Construct an ApiMain with the arguments passed via the URL. What we get back
 	 * is some form of an ApiMain, possibly even one that produces an error message,
@@ -72,7 +77,7 @@ try {
 	// Last chance hook before executing the API
 	wfRunHooks( 'ApiBeforeMain', array( &$processor ) );
 	if ( !$processor instanceof ApiMain ) {
-		throw new MWException( 'ApiBeforMain hook set $processor to a non-ApiMain class' );
+		throw new MWException( 'ApiBeforeMain hook set $processor to a non-ApiMain class' );
 	}
 } catch ( Exception $e ) {
 	// Crap. Try to report the exception in API format to be friendly to clients.
@@ -94,7 +99,6 @@ DeferredUpdates::doUpdates();
 
 // Log what the user did, for book-keeping purposes.
 $endtime = microtime( true );
-wfProfileOut( 'api.php' );
 
 wfLogProfilingData();
 
@@ -122,7 +126,7 @@ if ( $wgAPIRequestLog ) {
 	} else {
 		$items[] = "failed in ApiBeforeMain";
 	}
-	wfErrorLog( implode( ',', $items ) . "\n", $wgAPIRequestLog );
+	LegacyLogger::emit( implode( ',', $items ) . "\n", $wgAPIRequestLog );
 	wfDebug( "Logged API request to $wgAPIRequestLog\n" );
 }