From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 includes/gallery/ImageGalleryBase.php        | 20 +++++++-------------
 includes/gallery/TraditionalImageGallery.php |  4 +++-
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'includes/gallery')

diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php
index b0a593de..c89c6b6c 100644
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -30,39 +30,33 @@
 abstract class ImageGalleryBase extends ContextSource {
 	/**
 	 * @var array Gallery images
-	 * @deprecated since 1.23 (was declared "var") and will be removed in 1.24
 	 */
-	public $mImages;
+	protected $mImages;
 
 	/**
 	 * @var bool Whether to show the filesize in bytes in categories
-	 * @deprecated since 1.23 (was declared "var") and will be removed in 1.24
 	 */
-	public $mShowBytes;
+	protected $mShowBytes;
 
 	/**
 	 * @var bool Whether to show the filename. Default: true
-	 * @deprecated since 1.23 (was declared "var") and will be removed in 1.24
 	 */
-	public $mShowFilename;
+	protected $mShowFilename;
 
 	/**
 	 * @var string Gallery mode. Default: traditional
-	 * @deprecated since 1.23 (was declared "var") and will be removed in 1.24
 	 */
-	public $mMode;
+	protected $mMode;
 
 	/**
 	 * @var bool|string Gallery caption. Default: false
-	 * @deprecated since 1.23 (was declared "var") and will be removed in 1.24
 	 */
-	public $mCaption = false;
+	protected $mCaption = false;
 
 	/**
 	 * @var bool Hide blacklisted images?
-	 * @deprecated since 1.23 (was declared "var") and will be removed in 1.24
 	 */
-	public $mHideBadImages;
+	protected $mHideBadImages;
 
 	/**
 	 * @var Parser Registered parser object for output callbacks
@@ -120,7 +114,7 @@ abstract class ImageGalleryBase extends ContextSource {
 				'packed-overlay' => 'PackedOverlayImageGallery',
 			);
 			// Allow extensions to make a new gallery format.
-			wfRunHooks( 'GalleryGetModes', self::$modeMapping );
+			Hooks::run( 'GalleryGetModes', array( &self::$modeMapping ) );
 		}
 	}
 
diff --git a/includes/gallery/TraditionalImageGallery.php b/includes/gallery/TraditionalImageGallery.php
index 37f2221f..7a0206c2 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -72,7 +72,7 @@ class TraditionalImageGallery extends ImageGalleryBase {
 				if ( $this->mParser instanceof Parser ) {
 					# Give extensions a chance to select the file revision for us
 					$options = array();
-					wfRunHooks( 'BeforeParserFetchFileAndTitle',
+					Hooks::run( 'BeforeParserFetchFileAndTitle',
 						array( $this->mParser, $nt, &$options, &$descQuery ) );
 					# Fetch and register the file (file title may be different via hooks)
 					list( $img, $nt ) = $this->mParser->fetchFileAndTitle( $nt, $options );
@@ -133,6 +133,8 @@ class TraditionalImageGallery extends ImageGalleryBase {
 
 				$this->adjustImageParameters( $thumb, $imageParameters );
 
+				Linker::processResponsiveImages( $img, $thumb, $transformOptions );
+
 				# Set both fixed width and min-height.
 				$thumbhtml = "\n\t\t\t"
 					. '<div class="thumb" style="width: '
-- 
cgit v1.2.3-54-g00ecf