Fix bug 20688 (Hidden categories still hidden if there are no non-hidden categories...

diff --git a/includes/Skin.php b/includes/Skin.php
index 74d9fa0..42262cd 100644 (file)
--- 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';
                }