Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "TransformationalImageHandler: Fix use of __METHOD__ in closure"

Browse source
This commit is contained in:
jenkins-bot 2016-11-10 14:13:17 +00:00 committed by Gerrit Code Review
commit 9b4cea6d2e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/media/TransformationalImageHandler.php
View file

@ -511,21 +511,22 @@ abstract class TransformationalImageHandler extends ImageHandler {
*/
protected function getMagickVersion() {
$cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
$method = __METHOD__;
return $cache->getWithSetCallback(
'imagemagick-version',
$cache::TTL_HOUR,
function () {
function () use ( $method ) {
global $wgImageMagickConvertCommand;
$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
wfDebug( __METHOD__ . ": Running convert -version\n" );
wfDebug( $method . ": Running convert -version\n" );
$retval = '';
$return = wfShellExec( $cmd, $retval );
$x = preg_match(
'/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches
);
if ( $x != 1 ) {
wfDebug( __METHOD__ . ": ImageMagick version check failed\n" );
wfDebug( $method . ": ImageMagick version check failed\n" );
return false;
}