}
}
- global $wgAPIModules;
+ global $wgAPIModules, $wgAPIFormatModules;
$this->mModuleMgr = new ApiModuleManager( $this );
$this->mModuleMgr->addModules( self::$Modules, 'action' );
$this->mModuleMgr->addModules( $wgAPIModules, 'action' );
$this->mModuleMgr->addModules( self::$Formats, 'format' );
+ $this->mModuleMgr->addModules( $wgAPIFormatModules, 'format' );
$this->mResult = new ApiResult( $this );
$this->mEnableWrite = $enableWrite;
if ( $salt !== false ) {
if ( !isset( $moduleParams['token'] ) ) {
$this->dieUsageMsg( array( 'missingparam', 'token' ) );
- } else {
- if ( !$this->getUser()
- ->matchEditToken( $moduleParams['token'], $salt, $this->getContext()->getRequest() )
- ) {
- $this->dieUsageMsg( 'sessionfailure' );
- }
+ }
+
+ if ( !$this->getUser()->matchEditToken(
+ $moduleParams['token'],
+ $salt,
+ $this->getContext()->getRequest() )
+ ) {
+ $this->dieUsageMsg( 'sessionfailure' );
}
}
if ( $wgShowHostnames ) {
$this->dieUsage( "Waiting for $host: $lag seconds lagged", 'maxlag' );
- } else {
- $this->dieUsage( "Waiting for a database server: $lag seconds lagged", 'maxlag' );
}
- return false;
+ $this->dieUsage( "Waiting for a database server: $lag seconds lagged", 'maxlag' );
}
}