Merge "Api request log: improve module retrieval"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 31 Jul 2014 17:32:35 +0000 (17:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 31 Jul 2014 17:32:35 +0000 (17:32 +0000)
1  2 
api.php

diff --combined api.php
+++ b/api.php
@@@ -104,12 -104,17 +104,17 @@@ if ( $wgAPIRequestLog ) 
                wfTimestamp( TS_MW ),
                $endtime - $starttime,
                $wgRequest->getIP(),
 -              $_SERVER['HTTP_USER_AGENT']
 +              $wgRequest->getHeader( 'User-agent' )
        );
        $items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';
        if ( $processor ) {
-               $module = $processor->getModule();
-               if ( $module->mustBePosted() ) {
+               try {
+                       $manager = $processor->getModuleManager();
+                       $module = $manager->getModule( $wgRequest->getVal( 'action' ), 'action' );
+               } catch ( Exception $ex ) {
+                       $module = null;
+               }
+               if ( !$module || $module->mustBePosted() ) {
                        $items[] = "action=" . $wgRequest->getVal( 'action' );
                } else {
                        $items[] = wfArrayToCgi( $wgRequest->getValues() );