Simplify a bit :)

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 967c8ad..ba8fc2a 100644 (file)
--- 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' );
        }
 
        /**