From d86069d2f6cbcebfd70d2df3fcb22f61b1482ad6 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Tue, 17 May 2011 08:17:44 +0000
Subject: [PATCH] * remove unneeded behavior change for action=info in
 NS_MEDIAWIKI. * remove superfluous whitespace and update FIXME notation.

---
 includes/Article.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 1db124e1e0..d310c4081d 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -4051,17 +4051,10 @@ class Article {
 
 		if ( !$this->mTitle->exists() ) {
 			$wgOut->addHTML( '<div class="noarticletext">' );
-			if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-				// This doesn't quite make sense; the user is asking for
-				// information about the _page_, not the message... -- RC
-				$wgOut->addHTML( htmlspecialchars( $this->mTitle->getDefaultMessageText() ) );
-			} else {
-				$msg = $wgUser->isLoggedIn()
-					? 'noarticletext'
-					: 'noarticletextanon';
-				$wgOut->addWikiMsg( $msg );
-			}
-
+			$msg = $wgUser->isLoggedIn()
+				? 'noarticletext'
+				: 'noarticletextanon';
+			$wgOut->addWikiMsg( $msg );
 			$wgOut->addHTML( '</div>' );
 		} else {
 			$dbr = wfGetDB( DB_SLAVE );
@@ -4077,8 +4070,7 @@ class Article {
 			$pageInfo = $this->pageCountInfo( $page );
 			$talkInfo = $this->pageCountInfo( $page->getTalkPage() );
 
-
-			//FIXME: unescaped messages
+			// @todo FIXME: unescaped messages
 			$wgOut->addHTML( "<ul><li>" . wfMsg( "numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
 			$wgOut->addHTML( "<li>" . wfMsg( 'numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>' );
 
-- 
2.20.1