private $mContinuationManager;
private $mAction;
private $mEnableWrite;
- private $mInternalMode, $mSquidMaxage;
+ private $mInternalMode, $mCdnMaxAge;
/** @var ApiBase */
private $mModule;
'cookies' => $sessionCookies,
'ip' => $request->getIP(),
'userAgent' => $this->getUserAgent(),
- 'wiki' => wfWikiID(),
+ 'wiki' => WikiMap::getCurrentWikiDbDomain()->getId(),
]
);
}
$this->mContinuationManager = null;
$this->mEnableWrite = $enableWrite;
- $this->mSquidMaxage = -1; // flag for executeActionWithErrorHandling()
+ $this->mCdnMaxAge = -1; // flag for executeActionWithErrorHandling()
$this->mCommit = false;
}
$request = $this->getRequest();
// JSONP mode
- if ( $request->getVal( 'callback' ) !== null ) {
+ if ( $request->getCheck( 'callback' ) ) {
$this->lacksSameOriginSecurity = true;
return true;
}
. $this->msg( 'api-usage-mailinglist-ref' )->inLanguage( $formatter->getLanguage() )->text()
)
);
- } else {
- if ( $config->get( 'ShowExceptionDetails' ) ) {
- $result->addContentValue(
- $path,
- 'trace',
- $this->msg( 'api-exception-trace',
- get_class( $e ),
- $e->getFile(),
- $e->getLine(),
- MWExceptionHandler::getRedactedTraceAsString( $e )
- )->inLanguage( $formatter->getLanguage() )->text()
- );
- }
+ } elseif ( $config->get( 'ShowExceptionDetails' ) ) {
+ $result->addContentValue(
+ $path,
+ 'trace',
+ $this->msg( 'api-exception-trace',
+ get_class( $e ),
+ $e->getFile(),
+ $e->getLine(),
+ MWExceptionHandler::getRedactedTraceAsString( $e )
+ )->inLanguage( $formatter->getLanguage() )->text()
+ );
}
// Add the id and such
$ts->format( 'D M j H:i:s Y' ) === $value ||
$ts->format( 'D M j H:i:s Y' ) === $value
) {
+ $config = $this->getConfig();
$lastMod = $module->getConditionalRequestData( 'last-modified' );
if ( $lastMod !== null ) {
// Mix in some MediaWiki modification times
$modifiedTimes = [
'page' => $lastMod,
'user' => $this->getUser()->getTouched(),
- 'epoch' => $this->getConfig()->get( 'CacheEpoch' ),
+ 'epoch' => $config->get( 'CacheEpoch' ),
];
- if ( $this->getConfig()->get( 'UseSquid' ) ) {
+
+ if ( $config->get( 'UseCdn' ) ) {
// T46570: the core page itself may not change, but resources might
$modifiedTimes['sepoch'] = wfTimestamp(
- TS_MW, time() - $this->getConfig()->get( 'SquidMaxage' )
+ TS_MW, time() - $config->get( 'CdnMaxAge' )
);
}
Hooks::run( 'OutputPageCheckLastModified', [ &$modifiedTimes, $this->getOutput() ] );
'ts' => time(),
'ip' => $request->getIP(),
'userAgent' => $this->getUserAgent(),
- 'wiki' => wfWikiID(),
+ 'wiki' => WikiMap::getCurrentWikiDbDomain()->getId(),
'timeSpentBackend' => (int)round( $time * 1000 ),
'hadError' => $e !== null,
'errorCodes' => [],
'method' => $request->getMethod(),
'client_ip' => $request->getIP()
],
- 'database' => wfWikiID(),
+ 'database' => WikiMap::getCurrentWikiDbDomain()->getId(),
'backend_time_ms' => (int)round( $time * 1000 ),
];
*/
protected function printResult( $httpCode = 0 ) {
if ( $this->getConfig()->get( 'DebugAPI' ) !== false ) {
- $this->addWarning( 'apiwarn-wgDebugAPI' );
+ $this->addWarning( 'apiwarn-wgdebugapi' );
}
$printer = $this->mPrinter;