X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=thumb.php;h=7c3e757241538809853467ca4a0efa3593ed827c;hp=de201b914c9589a5102189b4f650676c6524e07f;hb=2f28050b6b866f684da92c1832c0a3938b59ef0b;hpb=944b93ee740d491ec6353f3fa5a439db41de97b8 diff --git a/thumb.php b/thumb.php index de201b914c..7c3e757241 100644 --- a/thumb.php +++ b/thumb.php @@ -22,6 +22,7 @@ */ use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MediaWikiServices; define( 'MW_NO_OUTPUT_COMPRESSION', 1 ); require __DIR__ . '/includes/WebStart.php'; @@ -317,7 +318,9 @@ function wfStreamThumb( array $params ) { $streamtime = microtime( true ) - $starttime; if ( $status->isOK() ) { - RequestContext::getMain()->getStats()->timing( 'media.thumbnail.stream', $streamtime ); + MediaWikiServices::getInstance()->getStatsdDataFactory()->timing( + 'media.thumbnail.stream', $streamtime + ); } else { wfThumbError( 500, 'Could not stream the file', null, [ 'file' => $thumbName, 'path' => $thumbPath, 'error' => $status->getWikiText( false, false, 'en' ) ] ); @@ -527,15 +530,6 @@ function wfExtractThumbParams( $file, $params ) { $thumbname = $params['thumbName']; unset( $params['thumbName'] ); - // Do the hook first for older extensions that rely on it. - if ( !Hooks::run( 'ExtractThumbParameters', [ $thumbname, &$params ] ) ) { - // Check hooks if parameters can be extracted - // Hooks return false if they manage to *resolve* the parameters - // This hook should be considered deprecated - wfDeprecated( 'ExtractThumbParameters', '1.22' ); - return $params; // valid thumbnail URL (via extension or config) - } - // FIXME: Files in the temp zone don't set a MIME type, which means // they don't have a handler. Which means we can't parse the param // string. However, not a big issue as what good is a param string