From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 27 May 2011 19:15:13 +0000 (+0000)
Subject: Simplify a bit :)
X-Git-Tag: 1.31.0-rc.0~29910
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=5833875a19f4244df5c3e912bc85d6f05334ef7d;p=lhc%2Fweb%2Fwiklou.git

Simplify a bit :)
---

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 967c8ad7ae..ba8fc2afb1 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -70,15 +70,13 @@ abstract class UploadBase {
 	 */
 	public static function isEnabled() {
 		global $wgEnableUploads;
+
 		if ( !$wgEnableUploads ) {
 			return false;
 		}
 
 		# Check php's file_uploads setting
-		if( !wfIsHipHop() && !wfIniGetBool( 'file_uploads' ) ) {
-			return false;
-		}
-		return true;
+		return wfIsHipHop() || wfIniGetBool( 'file_uploads' );
 	}
 
 	/**