X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FAjaxResponse.php;h=0c115053bac9642f36cbb1d02251e91374073712;hb=46c17ddb1ff10a1e073742c9d8b831cd915802f3;hp=0686578c174a386ca7f0df1d1d6807af33d28b42;hpb=c6adf0408cee1c0be97c222aa2689ec5800a84a4;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php index 0686578c17..0c115053ba 100644 --- a/includes/AjaxResponse.php +++ b/includes/AjaxResponse.php @@ -20,6 +20,7 @@ * @file * @ingroup Ajax */ +use MediaWiki\MediaWikiServices; /** * Handle responses for Ajax requests (send headers, print @@ -82,7 +83,7 @@ class AjaxResponse { function __construct( $text = null, Config $config = null ) { $this->mCacheDuration = null; $this->mVary = null; - $this->mConfig = $config ?: ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->mConfig = $config ?: MediaWikiServices::getInstance()->getMainConfig(); $this->mDisabled = false; $this->mText = ''; @@ -241,7 +242,7 @@ class AjaxResponse { # this breaks strtotime(). $modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] ); $modsinceTime = strtotime( $modsince ); - $ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 ); + $ismodsince = wfTimestamp( TS_MW, $modsinceTime ?: 1 ); wfDebug( "$fname: -- client send If-Modified-Since: $modsince", 'private' ); wfDebug( "$fname: -- we might send Last-Modified : $lastmod", 'private' );