X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fgallery%2FTraditionalImageGallery.php;h=f6527b820ed9022e5d0dde516917c341231eed35;hb=88b51507811f9294edb9fdcde0736565ea2766a9;hp=d2f741735166a72052d81bfa346e32f426f7c107;hpb=aa5e5790285040071bcaf2a64da88866261f9775;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/gallery/TraditionalImageGallery.php b/includes/gallery/TraditionalImageGallery.php
index d2f7417351..f6527b820e 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -43,7 +43,7 @@ class TraditionalImageGallery extends ImageGalleryBase {
 		}
 
 		$attribs = Sanitizer::mergeAttributes(
-			array( 'class' => 'gallery mw-gallery-' . $this->mMode ), $this->mAttribs );
+			[ 'class' => 'gallery mw-gallery-' . $this->mMode ], $this->mAttribs );
 
 		$modules = $this->getModules();
 
@@ -59,6 +59,16 @@ class TraditionalImageGallery extends ImageGalleryBase {
 			$output .= "\n\t<li class='gallerycaption'>{$this->mCaption}</li>";
 		}
 
+		if ( $this->mShowFilename ) {
+			// Preload LinkCache info for when generating links
+			// of the filename below
+			$lb = new LinkBatch();
+			foreach ( $this->mImages as $img ) {
+				$lb->addObj( $img[0] );
+			}
+			$lb->execute();
+		}
+
 		$lang = $this->getRenderLang();
 		# Output each image...
 		foreach ( $this->mImages as $pair ) {
@@ -73,9 +83,9 @@ class TraditionalImageGallery extends ImageGalleryBase {
 				# Get the file...
 				if ( $this->mParser instanceof Parser ) {
 					# Give extensions a chance to select the file revision for us
-					$options = array();
+					$options = [];
 					Hooks::run( 'BeforeParserFetchFileAndTitle',
-						array( $this->mParser, $nt, &$options, &$descQuery ) );
+						[ $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 );
 				} else {
@@ -122,12 +132,12 @@ class TraditionalImageGallery extends ImageGalleryBase {
 					/** @var MediaTransformOutput $thumb */
 					$vpad = $this->getVPad( $this->mHeights, $thumb->getHeight() );
 
-					$imageParameters = array(
+					$imageParameters = [
 						'desc-link' => true,
 						'desc-query' => $descQuery,
 						'alt' => $alt,
 						'custom-url-link' => $link
-					);
+					];
 
 					// In the absence of both alt text and caption, fall back on
 					// providing screen readers with the filename as alt text
@@ -176,10 +186,19 @@ class TraditionalImageGallery extends ImageGalleryBase {
 			}
 
 			$textlink = $this->mShowFilename ?
+				// Preloaded into LinkCache above
 				Linker::linkKnown(
 					$nt,
-					htmlspecialchars( $lang->truncate( $nt->getText(), $this->mCaptionLength ) )
-				) . "<br />\n" :
+					htmlspecialchars(
+						$this->mCaptionLength !== true ?
+							$lang->truncate( $nt->getText(), $this->mCaptionLength ) :
+							$nt->getText()
+					),
+					[
+						'class' => 'galleryfilename' .
+							( $this->mCaptionLength === true ? ' galleryfilename-truncate' : '' )
+					]
+				) . "\n" :
 				'';
 
 			$galleryText = $textlink . $text . $fileSize;
@@ -277,10 +296,10 @@ class TraditionalImageGallery extends ImageGalleryBase {
 	 * @return array
 	 */
 	protected function getThumbParams( $img ) {
-		return array(
+		return [
 			'width' => $this->mWidths,
 			'height' => $this->mHeights
-		);
+		];
 	}
 
 	/**
@@ -316,7 +335,7 @@ class TraditionalImageGallery extends ImageGalleryBase {
 	 * @return array Modules to include
 	 */
 	protected function getModules() {
-		return array();
+		return [];
 	}
 
 	/**