From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 27 Feb 2007 21:02:06 +0000 (+0000)
Subject: *Patch by WebBoy to use redirect table (bug 8799)
X-Git-Tag: 1.31.0-rc.0~53950
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=cbae9a9e59b5b905d1c08f4a7e58bf7596020a1a;p=lhc%2Fweb%2Fwiklou.git

*Patch by WebBoy to use redirect table (bug 8799)
---

diff --git a/includes/SpecialBrokenRedirects.php b/includes/SpecialBrokenRedirects.php
index 95a705e5c1..12dba8aad9 100644
--- a/includes/SpecialBrokenRedirects.php
+++ b/includes/SpecialBrokenRedirects.php
@@ -25,16 +25,16 @@ class BrokenRedirectsPage extends PageQueryPage {
 
 	function getSQL() {
 		$dbr = wfGetDB( DB_SLAVE );
-		list( $page, $pagelinks ) = $dbr->tableNamesN( 'page', 'pagelinks' );
+		list( $page, $redirect ) = $dbr->tableNamesN( 'page', 'redirect' );
 
 		$sql = "SELECT 'BrokenRedirects'  AS type,
 		                p1.page_namespace AS namespace,
 		                p1.page_title     AS title,
-		                pl_namespace,
-		                pl_title
-		           FROM $pagelinks AS pl
-                   JOIN $page p1 ON (p1.page_is_redirect=1 AND pl.pl_from=p1.page_id)
-		      LEFT JOIN $page AS p2 ON (pl_namespace=p2.page_namespace AND pl_title=p2.page_title )
+		                rd_namespace,
+		                rd_title
+		           FROM $redirect AS rd
+                   JOIN $page p1 ON (rd.rd_from=p1.page_id)
+		      LEFT JOIN $page AS p2 ON (rd_namespace=p2.page_namespace AND rd_title=p2.page_title )
     		                WHERE p2.page_namespace IS NULL";
 		return $sql;
 	}
@@ -47,8 +47,8 @@ class BrokenRedirectsPage extends PageQueryPage {
 		global $wgUser, $wgContLang;
 		
 		$fromObj = Title::makeTitle( $result->namespace, $result->title );
-		if ( isset( $result->pl_title ) ) {
-			$toObj = Title::makeTitle( $result->pl_namespace, $result->pl_title );
+		if ( isset( $result->rd_title ) ) {
+			$toObj = Title::makeTitle( $result->rd_namespace, $result->rd_title );
 		} else {
 			$blinks = $fromObj->getBrokenLinksFrom();
 			if ( $blinks ) {
diff --git a/includes/SpecialDoubleRedirects.php b/includes/SpecialDoubleRedirects.php
index 4db785f63a..5bb199c873 100644
--- a/includes/SpecialDoubleRedirects.php
+++ b/includes/SpecialDoubleRedirects.php
@@ -24,7 +24,7 @@ class DoubleRedirectsPage extends PageQueryPage {
 
 	function getSQLText( &$dbr, $namespace = null, $title = null ) {
 		
-		list( $page, $pagelinks ) = $dbr->tableNamesN( 'page', 'pagelinks' );
+		list( $page, $redirect ) = $dbr->tableNamesN( 'page', 'redirect' );
 
 		$limitToTitle = !( $namespace === null && $title === null );
 		$sql = $limitToTitle ? "SELECT" : "SELECT 'DoubleRedirects' as type," ;
@@ -32,14 +32,13 @@ class DoubleRedirectsPage extends PageQueryPage {
 			 " pa.page_namespace as namespace, pa.page_title as title," .
 			 " pb.page_namespace as nsb, pb.page_title as tb," .
 			 " pc.page_namespace as nsc, pc.page_title as tc" .
-		   " FROM $pagelinks AS la, $pagelinks AS lb, $page AS pa, $page AS pb, $page AS pc" .
-		   " WHERE pa.page_is_redirect=1 AND pb.page_is_redirect=1" .
-			 " AND la.pl_from=pa.page_id" .
-			 " AND la.pl_namespace=pb.page_namespace" .
-			 " AND la.pl_title=pb.page_title" .
-			 " AND lb.pl_from=pb.page_id" .
-			 " AND lb.pl_namespace=pc.page_namespace" .
-			 " AND lb.pl_title=pc.page_title";
+		   " FROM $redirect AS ra, $redirect AS rb, $page AS pa, $page AS pb, $page AS pc" .
+		   " WHERE ra.rd_from=pa.page_id" .
+			 " AND ra.rd_namespace=pb.page_namespace" .
+			 " AND ra.rd_title=pb.page_title" .
+			 " AND rb.rd_from=pb.page_id" .
+			 " AND rb.rd_namespace=pc.page_namespace" .
+			 " AND rb.rd_title=pc.page_title";
 
 		if( $limitToTitle ) {
 			$encTitle = $dbr->addQuotes( $title );