From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 14 Dec 2015 00:29:27 +0000 (+0000)
Subject: Merge "PHP 7 compatibility: Fix variable interpolation in ImageGalleryBase.php"
X-Git-Tag: 1.31.0-rc.0~8698
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=25c9157bca911120b578ace6147582f37c04b333;hp=4657bd99edffe5c7f4a204b2fc3ce7471bfb208c;p=lhc%2Fweb%2Fwiklou.git

Merge "PHP 7 compatibility: Fix variable interpolation in ImageGalleryBase.php"
---

diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php
index c89c6b6c1e..9ea97029c3 100644
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -98,7 +98,8 @@ abstract class ImageGalleryBase extends ContextSource {
 		$mode = $wgContLang->lc( $mode );
 
 		if ( isset( self::$modeMapping[$mode] ) ) {
-			return new self::$modeMapping[$mode]( $mode, $context );
+			$class = self::$modeMapping[$mode];
+			return new $class( $mode, $context );
 		} else {
 			throw new MWException( "No gallery class registered for mode $mode" );
 		}