Commited the categories redirect stuff by mistake.

diff --git a/includes/Namespace.php b/includes/Namespace.php
index c296de9..7849390 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -50,7 +50,7 @@ class Namespace {
         * @return bool
         */
        static function isMovable( $index ) {
-               return !( $index < NS_MAIN || $index == NS_IMAGE );
+               return !( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY );
        }
 
        /**

diff --git a/includes/Parser.php b/includes/Parser.php
index f5425c0..484c7dc 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1746,17 +1746,6 @@ class Parser
                                        wfProfileIn( "$fname-category" );
                                        $s = rtrim($s . "\n"); # bug 87
 
-                                       # Redirect categories - bug 3311
-                                       $dbw =& wfGetDB( DB_SLAVE );
-                                       $obj = $dbw->selectRow( array( 'redirect' ),
-                                               array( 'rd_namespace', 'rd_title' ),
-                                               array( 'rd_from' => $nt->getArticleID() ),
-                                               __METHOD__ );
-                                       if ( $obj && $obj->rd_namespace == NS_CATEGORY ) {
-                                               # The category redirects to another category; follow it
-                                               $nt = Title::makeTitle( NS_CATEGORY, $obj->rd_title );
-                                       }
-
                                        if ( $wasblank ) {
                                                if ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
                                                        $sortkey = $this->mTitle->getText();