From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 25 May 2009 13:49:01 +0000 (+0000)
Subject: Work around parser madness, because I have no idea what is going on. The following... 
X-Git-Tag: 1.31.0-rc.0~41659
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=281c378ee733e78c3d4a6a15aec74692d52f2fcb;p=lhc%2Fweb%2Fwiklou.git

Work around parser madness, because I have no idea what is going on. The following renders each line as a paragraph:
<div>a
b
c/div>
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index f8ae310011..8af1dbc5f1 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1272,7 +1272,7 @@ class OutputPage {
 			$text = wfMsgNoTrans( 'permissionserrorstext', count($errors)). "\n\n";
 		} else {
 			global $wgLang;
-			$action_desc = wfMsg( "action-$action" );
+			$action_desc = wfMsgNoTrans( "action-$action" );
 			$text = wfMsgNoTrans( 'permissionserrorstext-withaction', count($errors), $action_desc ) . "\n\n";
 		}
 
@@ -1287,7 +1287,7 @@ class OutputPage {
 			}
 			$text .= '</ul>';
 		} else {
-			$text .= '<div class="permissions-errors">' . call_user_func_array( 'wfMsgNoTrans', reset( $errors ) ) . '</div>';
+			$text .= "<div class=\"permissions-errors\">\n" . call_user_func_array( 'wfMsgNoTrans', reset( $errors ) ) . "\n</div>";
 		}
 
 		return $text;