From e474bdca3172884caff590ffeb1684ac42795700 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Thu, 10 Nov 2016 14:18:48 +0100
Subject: [PATCH] TransformationalImageHandler: Fix use of __METHOD__ in
 closure

Change-Id: Idff6303fac1f494ea59b88fd73245c63f2cf4a76
---
 includes/media/TransformationalImageHandler.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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;
 				}
 
-- 
2.20.1