From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 6 Jan 2012 16:58:38 +0000 (+0000)
Subject: Follow up r108248, r108141: use wfUnpack() so we don't duplicate logic. Could also... 
X-Git-Tag: 1.31.0-rc.0~25474
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=753b4a85650d6fb69b0db757a3c70e3fccfb1f7e;p=lhc%2Fweb%2Fwiklou.git

Follow up r108248, r108141: use wfUnpack() so we don't duplicate logic. Could also pass $length for sanity, but someone else can do that
---

diff --git a/includes/media/XCF.php b/includes/media/XCF.php
index b113d70d38..ff23334bd1 100644
--- a/includes/media/XCF.php
+++ b/includes/media/XCF.php
@@ -78,18 +78,16 @@ class XCFHandler extends BitmapHandler {
 		#                         1: Grayscale
 		#                         2: Indexed color
 		#        (enum GimpImageBaseType in libgimpbase/gimpbaseenums.h)
-		wfSuppressWarnings();
-		$header = unpack(
-			  "A9magic"     # A: space padded
-			. "/a5version"  # a: zero padded
-			. "/Nwidth"     # \
-			. "/Nheight"    # N: unsigned long 32bit big endian
-			. "/Nbase_type" # /
-		, $binaryHeader
-		);
-		wfRestoreWarnings();
-
-		if( $header === false ) {
+		try {
+			$header = wfUnpack(
+				  "A9magic"     # A: space padded
+				. "/a5version"  # a: zero padded
+				. "/Nwidth"     # \
+				. "/Nheight"    # N: unsigned long 32bit big endian
+				. "/Nbase_type" # /
+			, $binaryHeader
+			);
+		} catch( MWException $mwe ) {
 			return false;
 		}