From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 10 Nov 2016 14:13:17 +0000 (+0000)
Subject: Merge "TransformationalImageHandler: Fix use of __METHOD__ in closure"
X-Git-Tag: 1.31.0-rc.0~4901
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=9b4cea6d2ea9a1a6fd9d9d8b9db087dfd7afaa90;hp=d3660d55eda56fcd2e27b0ffaaaa23c3ae6aced7;p=lhc%2Fweb%2Fwiklou.git

Merge "TransformationalImageHandler: Fix use of __METHOD__ in closure"
---

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 11c4d4214c..e33c27e99d 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -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;
 				}