From: Rotem Liss <rotem@users.mediawiki.org>
Date: Fri, 22 Dec 2006 19:50:56 +0000 (+0000)
Subject: Commited the categories redirect stuff by mistake.
X-Git-Tag: 1.31.0-rc.0~54814
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=c0d5b635883ad3ee1bbf856b3e04c0a246f73df8;p=lhc%2Fweb%2Fwiklou.git

Commited the categories redirect stuff by mistake.
---

diff --git a/includes/Namespace.php b/includes/Namespace.php
index c296de9c2c..78493902f2 100644
--- 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 f5425c05be..484c7dc891 100644
--- 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();