From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 6 Jan 2011 03:27:01 +0000 (+0000)
Subject: Fixup FIXME on r65818
X-Git-Tag: 1.31.0-rc.0~32772
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=7444a29725d9edaf802e9871b6fc357f8935dcc1;p=lhc%2Fweb%2Fwiklou.git

Fixup FIXME on r65818
---

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 1e3414f350..d02f752054 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -77,21 +77,13 @@ abstract class UploadBase {
 		return true;
 	}
 
-	/**
-	 * Returns an array of permissions that is required to upload a file
-	 * 
-	 * @return array
-	 */
-	public static function getRequiredPermissions() {
-		return array( 'upload', 'edit' );
-	}
 	/**
 	 * Returns true if the user can use this upload module or else a string
 	 * identifying the missing permission.
 	 * Can be overriden by subclasses.
 	 */
 	public static function isAllowed( $user ) {
-		foreach ( self::getRequiredPermissions() as $permission ) {
+		foreach ( array( 'upload', 'edit' ) as $permission ) {
 			if ( !$user->isAllowed( $permission ) ) {
 				return $permission;
 			}