From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Mon, 15 Dec 2014 15:34:21 +0000 (+0100)
Subject: Followup cf5f641: pass $params by reference again
X-Git-Tag: 1.31.0-rc.0~12959
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=016d617bc302c76e5f728518d77dfa7bd8c086b3;p=lhc%2Fweb%2Fwiklou.git

Followup cf5f641: pass $params by reference again

&$params was changed to $params, but hooks.txt still documents
this parameter as being passed by reference, and VipsScaler expects this.

Giuseppe and I suspect this may be what's causing the HHVM segfaults
we're seeing in beta labs.

Change-Id: Ib018f23bc44c247aefc277a0c75ff8577f309ab4
---

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 51cd28d2c8..fd8d81d24c 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -589,14 +589,14 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 * @return bool
 	 * @since 1.25
 	 */
-	public function isImageAreaOkForThumbnaling( $file, $params ) {
+	public function isImageAreaOkForThumbnaling( $file, &$params ) {
 		global $wgMaxImageArea;
 
 		# For historical reasons, hook starts with BitmapHandler
 		$checkImageAreaHookResult = null;
 		Hooks::run(
 			'BitmapHandlerCheckImageArea',
-			array( $file, $params, &$checkImageAreaHookResult )
+			array( $file, &$params, &$checkImageAreaHookResult )
 		);
 
 		if ( !is_null( $checkImageAreaHookResult ) ) {