(bug 13140) Show parent categories in category namespace

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6298582..3d1ffe8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -38,6 +38,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13115) rebuildrecentchanges should print the current value of $wgRCMaxAge
 * (bug 13132) Unable to unprotect pages protected with earlier versions of MediaWiki
 * (bug 13137) Bots to edit protected pages
+* (bug 13140) Show parent categories in category namespace
 
 === API changes in 1.13 ===
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index f152fac..d39b80c 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -271,7 +271,7 @@ class OutputPage {
         * Add an array of categories, with names in the keys
         */
        public function addCategoryLinks( $categories ) {
-               global $wgUser, $wgContLang;
+               global $wgUser, $wgContLang, $wgTitle;
 
                if ( !is_array( $categories ) ) {
                        return;
@@ -298,7 +298,7 @@ class OutputPage {
 
                # Remove categories with hiddencat
                foreach ( $res as $row ) {
-                       if ( isset( $row->pp_value ) ) {
+                       if ( isset( $row->pp_value ) and $wgTitle->getNamespace() != NS_CATEGORY ) {
                                unset( $categories[$row->page_title] );
                        }
                }