http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88990
Revision: 88990
Author: ialex
Date: 2011-05-27 19:15:13 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Simplify a bit :)
Modified Paths:
--------------
trunk/phase3/includes/upload/UploadBase.php
Modified: trunk/phase3/includes/upload/UploadBase.php
===================================================================
--- trunk/phase3/includes/upload/UploadBase.php 2011-05-27 19:12:28 UTC (rev
88989)
+++ trunk/phase3/includes/upload/UploadBase.php 2011-05-27 19:15:13 UTC (rev
88990)
@@ -70,15 +70,13 @@
*/
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' );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
