From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Fri, 20 Feb 2009 16:11:36 +0000 (+0000)
Subject: * (bug 17585) Hide legend on Special:Specialpages from non-privileged users
X-Git-Tag: 1.31.0-rc.0~42766
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=66091e9765f09fa964d3536986fe40f7731889bc;p=lhc%2Fweb%2Fwiklou.git

* (bug 17585) Hide legend on Special:Specialpages from non-privileged users
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f8d90810f0..a6d1e2cf65 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -112,6 +112,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   $wgForeignFileRepos
 * Special:ListUsers: Sort list of usergroups by alphabet
 * (bug 16762) Special:Movepage now shows a list of subpages when possible
+* (bug 17585) Hide legend on Special:Specialpages from non-privileged users
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.
diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php
index 560ba445c8..4959f107eb 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -48,19 +48,21 @@ function wfSpecialSpecialpages() {
 		$groups['other'] = $other;
 	}
 
+	$includesRestrictedPages = false;
 	/** Now output the HTML */
 	foreach ( $groups as $group => $sortedPages ) {
 		$middle = ceil( count($sortedPages)/2 );
 		$total = count($sortedPages);
 		$count = 0;
 
-		$wgOut->addHTML( "<h4 class='mw-specialpagesgroup'>".wfMsgHtml("specialpages-group-$group")."</h4>\n" );
+		$wgOut->wrapWikiMsg( "<h4 class='mw-specialpagesgroup'>$1</h4>\n", "specialpages-group-$group" );
 		$wgOut->addHTML( "<table style='width: 100%;' class='mw-specialpages-table'><tr>" );
 		$wgOut->addHTML( "<td width='30%' valign='top'><ul>\n" );
 		foreach( $sortedPages as $desc => $specialpage ) {
 			list( $title, $restricted ) = $specialpage;
 			$link = $sk->makeKnownLinkObj( $title , htmlspecialchars( $desc ) );
 			if( $restricted ) {
+				$includesRestrictedPages = true;
 				$wgOut->addHTML( "<li class='mw-specialpages-page mw-specialpagerestricted'>{$link}</li>\n" );
 			} else {
 				$wgOut->addHTML( "<li>{$link}</li>\n" );
@@ -74,9 +76,8 @@ function wfSpecialSpecialpages() {
 		}
 		$wgOut->addHTML( "</ul></td><td width='30%' valign='top'></td></tr></table>\n" );
 	}
-	$wgOut->addHTML(
-		Xml::openElement('div', array( 'class' => 'mw-specialpages-notes' )).
-		wfMsgWikiHtml('specialpages-note').
-		Xml::closeElement('div')
-	);
+
+	if ( $includesRestrictedPages ) {
+		$wgOut->wrapWikiMsg( "<div class=\"mw-specialpages-notes\">\n$1\n</div>", 'specialpages-note' );
+	}
 }