From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Thu, 17 Sep 2009 15:24:04 +0000 (+0000)
Subject: Fix bug 20688 (Hidden categories still hidden if there are no non-hidden categories... 
X-Git-Tag: 1.31.0-rc.0~39678
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=9626d697f83f70332b6a8d79b02f5e7f5da5c75d;p=lhc%2Fweb%2Fwiklou.git

Fix bug 20688 (Hidden categories still hidden if there are no non-hidden categories and the showhiddencats option is on). Regression in r55573.
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 74d9fa071b..42262cd85f 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -895,11 +895,17 @@ END;
 	}
 
 	function getCategories() {
-		$catlinks=$this->getCategoryLinks();
+		$catlinks = $this->getCategoryLinks();
 
 		$classes = 'catlinks';
+		
+		// Check what we're showing
+		global $wgOut, $wgUser;
+		$allCats = $wgOut->getCategoryLinks();
+		$showHidden = $wgUser->getBoolOption( 'showhiddencats' ) ||
+						$this->mTitle->getNamespace() == NS_CATEGORY;
 
-		if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false ) {
+		if( empty($allCats['normal']) && !( !empty($allCats['hidden']) && $showHidden ) ) {
 			$classes .= ' catlinks-allhidden';
 		}