From: Ilmari Karonen <vyznev@users.mediawiki.org>
Date: Wed, 9 Mar 2011 00:06:57 +0000 (+0000)
Subject: (bug 14645) Show expensive special pages differently in miser mode on Special:Special... 
X-Git-Tag: 1.31.0-rc.0~31550
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=7b9aaf78329d756206b61d604428b0c312d8d8f8;p=lhc%2Fweb%2Fwiklou.git

(bug 14645) Show expensive special pages differently in miser mode on Special:SpecialPages.  Patch by Jarry1250 with a few tweaks by me.  Tested, saw no errors or warnings.
---

diff --git a/CREDITS b/CREDITS
index 208b9208c8..aa87b7abf9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -139,6 +139,7 @@ following names for their contribution to the product.
 * Umherirrender
 * Ville Stadista
 * Zachary Hauri
+* Jarry1250
 
 == Translators ==
 * Anders Wegge Jakobsen
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 94220048a5..1153ff4caf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -92,6 +92,8 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * CSS stylesheet MediaWiki:Noscript.css is now loaded for users with JavaScript
   disabled (enclosed in the head in a <noscript> tag)
 * Added UserGetLanguageObject hook to change the language used in $wgLang
+* (bug 14645) When $wgMiserMode is on, expensive special pages are styled
+  differently (italicized by default) on Special:SpecialPages
 
 === Bug fixes in 1.18 ===
 * (bug 23119) WikiError class and subclasses are now marked as deprecated
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index cfd880321e..48e7f02880 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -819,6 +819,18 @@ class SpecialPage {
 		return $this->mLocalName;
 	}
 
+	/**
+	 * Is this page expensive (for some definition of expensive)?
+	 * Expensive pages are disabled or cached in miser mode.  Originally used
+	 * (and still overridden) by QueryPage and subclasses, moved here so that
+	 * Special:SpecialPages can safely call it for all special pages.
+	 *
+	 * @return Boolean
+	 */
+	public function isExpensive() {
+		return false;
+	}
+
 	/**
 	 * Can be overridden by subclasses with more complicated permissions
 	 * schemes.
diff --git a/includes/specials/SpecialSpecialpages.php b/includes/specials/SpecialSpecialpages.php
index fe59a49cd5..d13fb0358c 100644
--- a/includes/specials/SpecialSpecialpages.php
+++ b/includes/specials/SpecialSpecialpages.php
@@ -65,7 +65,7 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 				if( !isset( $groups[$group] ) ) {
 					$groups[$group] = array();
 				}
-				$groups[$group][$page->getDescription()] = array( $page->getTitle(), $page->isRestricted() );
+				$groups[$group][$page->getDescription()] = array( $page->getTitle(), $page->isRestricted(), $page->isExpensive() );
 			}
 		}
 
@@ -87,10 +87,11 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 	}
 
 	private function outputPageList( $groups ) {
-		global $wgUser, $wgOut;
+		global $wgUser, $wgOut, $wgMiserMode;
 
 		$sk = $wgUser->getSkin();
 		$includesRestrictedPages = false;
+		$includesCachedPages = false;
 
 		foreach ( $groups as $group => $sortedPages ) {
 			$middle = ceil( count( $sortedPages )/2 );
@@ -105,14 +106,20 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 				Html::openElement( 'ul' ) . "\n"
 			);
 			foreach( $sortedPages as $desc => $specialpage ) {
-				list( $title, $restricted ) = $specialpage;
-				$link = $sk->linkKnown( $title , htmlspecialchars( $desc ) );
+				list( $title, $restricted, $expensive) = $specialpage;
+				
+				$pageClasses = array();
+				if ( $expensive && $wgMiserMode ){
+					$includesCachedPages = true;
+					$pageClasses[] = 'mw-specialpagecached';
+				}
 				if( $restricted ) {
 					$includesRestrictedPages = true;
-					$wgOut->addHTML( Html::rawElement( 'li', array( 'class' => 'mw-specialpages-page mw-specialpagerestricted' ), Html::rawElement( 'strong', array(), $link ) ) . "\n" );
-				} else {
-					$wgOut->addHTML( Html::rawElement( 'li', array(), $link ) . "\n" );
+					$pageClasses[] = 'mw-specialpagerestricted';
 				}
+				
+				$link = $sk->linkKnown( $title , htmlspecialchars( $desc ) );
+				$wgOut->addHTML( Html::rawElement( 'li', array( 'class' => implode( ' ', $pageClasses ) ), $link ) . "\n" );
 
 				# Split up the larger groups
 				$count++;
@@ -131,7 +138,7 @@ class SpecialSpecialpages extends UnlistedSpecialPage {
 			);
 		}
 
-		if ( $includesRestrictedPages ) {
+		if ( $includesRestrictedPages || $includesCachedPages ) {
 			$wgOut->wrapWikiMsg( "<div class=\"mw-specialpages-notes\">\n$1\n</div>", 'specialpages-note' );
 		}
 	}
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 322c7a9944..b5ca699106 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4366,7 +4366,8 @@ Enter the file name without the "{{ns:file}}:" prefix.',
 'specialpages-summary'           => '', # do not translate or duplicate this message to other languages
 'specialpages-note'              => '----
 * Normal special pages.
-* <strong class="mw-specialpagerestricted">Restricted special pages.</strong>',
+* <span class="mw-specialpagerestricted">Restricted special pages.</span>
+* <span class="mw-specialpagecached">Cached-only special pages.</span>',
 'specialpages-group-maintenance' => 'Maintenance reports',
 'specialpages-group-other'       => 'Other special pages',
 'specialpages-group-login'       => 'Login / sign up',
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 02561ff33c..75df71bb5c 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -493,6 +493,15 @@ td#mw-prefixindex-nav-form {
 	vertical-align: top;
 }
 
+/* Special:Specialpages style */
+.mw-specialpagecached{
+	font-style:italic;
+}
+
+.mw-specialpagerestricted{
+	font-weight:bold;
+}
+
 /*
  * Recreating deleted page warning
  * Reupload file warning