From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 8 Sep 2011 19:11:33 +0000 (+0000)
Subject: Fix for r96516: undefined variable $flags
X-Git-Tag: 1.31.0-rc.0~27784
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=553f2b8c3096d766324ae19990761ce168a2668f;p=lhc%2Fweb%2Fwiklou.git

Fix for r96516: undefined variable $flags
---

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index cfa9fcb0d9..5b48fae87b 100644
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -675,10 +675,11 @@ abstract class File {
 	 * @param $thumbUrl string: the URL of the thumbnail file.
 	 * @param $params Array: an associative array of handler-specific parameters.
 	 *                Typical keys are width, height and page.
+	 * @param $flags Integer: a bitfield, may contain self::RENDER_NOW to force rendering
 	 *
 	 * @return MediaTransformOutput | false
 	 */
-	protected function maybeDoTransform( $thumbName, $thumbUrl, $params ) {
+	protected function maybeDoTransform( $thumbName, $thumbUrl, $params, $flags = 0 ) {
 		global $wgIgnoreImageErrors, $wgThumbnailEpoch;
 
 		$thumbPath = $this->getThumbPath( $thumbName );
@@ -751,7 +752,7 @@ abstract class File {
 			$thumbName = $this->thumbName( $normalisedParams );
 			$thumbUrl = $this->getThumbUrl( $thumbName );
 
-			$thumb = $this->maybeDoTransform( $thumbName, $thumbUrl, $params );
+			$thumb = $this->maybeDoTransform( $thumbName, $thumbUrl, $params, $flags );
 
 			// Purge. Useful in the event of Core -> Squid connection failure or squid
 			// purge collisions from elsewhere during failure. Don't keep triggering for