| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -895,11 +895,17 @@ |
| 896 | 896 | } |
| 897 | 897 | |
| 898 | 898 | function getCategories() { |
| 899 | | - $catlinks=$this->getCategoryLinks(); |
| | 899 | + $catlinks = $this->getCategoryLinks(); |
| 900 | 900 | |
| 901 | 901 | $classes = 'catlinks'; |
| | 902 | + |
| | 903 | + // Check what we're showing |
| | 904 | + global $wgOut, $wgUser; |
| | 905 | + $allCats = $wgOut->getCategoryLinks(); |
| | 906 | + $showHidden = $wgUser->getBoolOption( 'showhiddencats' ) || |
| | 907 | + $this->mTitle->getNamespace() == NS_CATEGORY; |
| 902 | 908 | |
| 903 | | - if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false ) { |
| | 909 | + if( empty($allCats['normal']) && !( !empty($allCats['hidden']) && $showHidden ) ) { |
| 904 | 910 | $classes .= ' catlinks-allhidden'; |
| 905 | 911 | } |
| 906 | 912 | |