From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 22 Mar 2011 22:49:39 +0000 (+0000)
Subject: Partial revert to r83979
X-Git-Tag: 1.31.0-rc.0~31236
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=3a0dabe874eda01206b3ff7bbbb47ae1ec62611a;p=lhc%2Fweb%2Fwiklou.git

Partial revert to r83979

Reverting code in SpecialUpload, as it broke errors, leaving the other changes in place, as they are fine
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 89aa7fecef..9072e7a31f 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -455,8 +455,8 @@ class SpecialUpload extends SpecialPage {
 		$permErrors = $this->mUpload->verifyPermissions( $wgUser );
 		if( $permErrors !== true ) {
 			$code = array_shift( $permErrors[0] );
-			$this->showRecoverableUploadError( wfMsgExt( $code[0],
-					'parseinline', $code[1] ) );
+			$this->showRecoverableUploadError( wfMsgExt( $code,
+					'parseinline', $permErrors[0] ) );
 			return;
 		}