From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Wed, 2 Jan 2008 01:16:44 +0000 (+0000)
Subject: Revert incorrectly committed file, again.
X-Git-Tag: 1.31.0-rc.0~50189
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=89c0bc2a1361343a6c4a919bc3f4d89193a49db8;p=lhc%2Fweb%2Fwiklou.git

Revert incorrectly committed file, again.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index faf533af8e..0c691ab82b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -981,14 +981,14 @@ class OutputPage {
 
 	/**
 	 * @param array $errors An array of arrays returned by Title::getUserPermissionsErrors
-	 * @return string The wikitext error-messages, formatted into a list.
+	 * @return string The error-messages, formatted into a list.
 	 */
 	public function formatPermissionsErrorMessage( $errors ) {
-		global $wgParser;
-	
-		$text = wfMsgExt( 'permissionserrorstext', array( 'parsemag' ), count( $errors ) ) . "\n\n";
+		$text = '';
+
+		if (sizeof( $errors ) > 1) {
 
-		if (count( $errors ) > 1) {
+			$text .= wfMsgExt( 'permissionserrorstext', array( 'parse' ), count( $errors ) ) . "\n";
 			$text .= '<ul class="permissions-errors">' . "\n";
 
 			foreach( $errors as $error )
@@ -999,7 +999,7 @@ class OutputPage {
 			}
 			$text .= '</ul>';
 		} else {
-			$text .= '<span class="permissions-errors">' . call_user_func_array( 'wfMsg', $errors[0]) . '</span>';
+			$text .= call_user_func_array( 'wfMsg', $errors[0]);
 		}
 
 		return $text;