Don't force edit encoding when LanguageEo.php is loaded; defer until $wgContLang...

[lhc/web/wiklou.git] / includes / SpecialDoubleRedirects.php

diff --git a/includes/SpecialDoubleRedirects.php b/includes/SpecialDoubleRedirects.php
index 41091ce..cc044f1 100644 (file)
--- a/includes/SpecialDoubleRedirects.php
+++ b/includes/SpecialDoubleRedirects.php
@@ -26,19 +26,20 @@ class DoubleRedirectsPage extends PageQueryPage {
 
        function getPageHeader( ) {
                #FIXME : probably need to add a backlink to the maintenance page.
-               return '<p>'.wfMsg("doubleredirectstext")."</p><br>\n";
+               return '<p>'.wfMsg("doubleredirectstext")."</p><br />\n";
        }
 
        function getSQL() {
                $dbr =& wfGetDB( DB_SLAVE );
-               extract( $dbr->tableNames( 'cur', 'links' ) );
+               extract( $dbr->tableNames( 'page', 'links', 'text' ) );
 
-               $sql = "SELECT ca.cur_namespace as ns_a, ca.cur_title as title_a," . 
-                          "  cb.cur_namespace as ns_b, cb.cur_title as title_b," .
-                          "  cb.cur_text AS rt " . 
-                          "FROM $links,$cur AS ca,$cur AS cb ". 
-                          "WHERE ca.cur_is_redirect=1 AND cb.cur_is_redirect=1 AND l_to=cb.cur_id " .
-                          "  AND l_from=ca.cur_id " ;
+               $sql = "SELECT pa.page_namespace as ns_a, pa.page_title as title_a,
+                            pb.page_namespace as ns_b, pb.page_title as title_b,
+                            old_text AS rt 
+                          FROM $text AS t, $links,$page AS pa,$page AS pb 
+                          WHERE pa.page_is_redirect=1 AND pb.page_is_redirect=1 AND l_to=pb.page_id 
+                            AND l_from=pa.page_id 
+                            AND pb.page_latest=t.old_id" ;
                return $sql;
        }