(bug 13891) Show categories box even if all categories are hidden and user has "show...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 831f1d9..e634c7c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -230,6 +230,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13583) No "poweredby" in Modern skin
 * (bug 13880) "Printable" link in Modern skin now formats as print mode
 * (bug 13885) Bump default $wgSVGMaxSize from 1024 to 2048 pixels
+* (bug 13891) Show categories box even if all categories are hidden and user has
+  "show hidden categories" option on
 
 
 === API changes in 1.13 ===

diff --git a/includes/Skin.php b/includes/Skin.php
index 854d6ca..9ee07ac 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -725,11 +725,12 @@ END;
 
                $classes = 'catlinks';
 
-               if(FALSE === strpos($catlinks,'<div id="mw-normal-catlinks">')) {
+               if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false &&
+                       strpos( $catlinks, '<div id="mw-hidden-catlinks" class="mw-hidden-cats-hidden">' ) !== false ) {
                        $classes .= ' catlinks-allhidden';
                }
 
-               if(!empty($catlinks)) {
+               if( !empty( $catlinks ) ){
                        return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
                }
        }