Revert r25037 -- just removes functionality from Special:DoubleRedirects instead...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 16bf4d6..370b0d0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -400,8 +400,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   lost and transparent pixels to be turned black
 * (bug 9339) General error pages were transforming messages and their parameters
   in the wrong order
-* (bug 10985) Special:DoubleRedirects was omitting "fixed" results when cached,
-  leading to inconsistent paging behaviour
 * (bug 9026) Incorrect heading numbering when viewing Special:Statistics with
   "auto-numbered headings" enabled
 * Fixed invalid XHTML in Special:Upload

diff --git a/includes/SpecialDoubleRedirects.php b/includes/SpecialDoubleRedirects.php
index bc4df9f..a010a2b 100644 (file)
--- a/includes/SpecialDoubleRedirects.php
+++ b/includes/SpecialDoubleRedirects.php
@@ -22,28 +22,36 @@ class DoubleRedirectsPage extends PageQueryPage {
                return wfMsgExt( 'doubleredirectstext', array( 'parse' ) );
        }
 
-       function getSql() {
-               $dbr = wfGetDB( DB_SLAVE );
+       function getSQLText( &$dbr, $namespace = null, $title = null ) {
+               
                list( $page, $redirect ) = $dbr->tableNamesN( 'page', 'redirect' );
-               return "
-                       SELECT
-                               'DoubleRedirects' as type,
-                               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
-                               $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";
+
+               $limitToTitle = !( $namespace === null && $title === null );
+               $sql = $limitToTitle ? "SELECT" : "SELECT 'DoubleRedirects' as type," ;
+               $sql .=
+                        " 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 $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 );
+                       $sql .= " AND pa.page_namespace=$namespace" .
+                                       " AND pa.page_title=$encTitle";
+               }
+
+               return $sql;
+       }
+       
+       function getSQL() {
+               $dbr = wfGetDB( DB_SLAVE );
+               return $this->getSQLText( $dbr );
        }
 
        function getOrder() {
@@ -52,30 +60,33 @@ class DoubleRedirectsPage extends PageQueryPage {
 
        function formatResult( $skin, $result ) {
                global $wgContLang;
-               $parts = array();
        
+               $fname = 'DoubleRedirectsPage::formatResult';
                $titleA = Title::makeTitle( $result->namespace, $result->title );
-               $parts[] = $skin->makeKnownLinkObj( $titleA, '', 'redirect=no' );
-               $parts[] = '(' . $skin->makeKnownLinkObj(
-                       $titleA,
-                       wfMsgHtml( 'qbedit' ),
-                       'action=edit&redirect=no'
-               ) . ')';
-       
-               // If the report isn't cached, generate some useful additional
-               // links to the target page, and *that* page's redirect target
-               if( isset( $result->nsb ) ) {
-                       $parts[] = $wgContLang->getArrow() . $wgContLang->getDirMark();
-                       $parts[] = $skin->makeKnownLinkObj(
-                               Title::makeTitle( $result->nsb, $result->tb ),
-                               '',
-                               'redirect=no'
-                       );
-                       $parts[] = $wgContLang->getArrow() . $wgContLang->getDirMark();
-                       $parts[] = $skin->makeKnownLinkObj( Title::makeTitle( $result->nsc, $result->tc ) );
+
+               if ( $result && !isset( $result->nsb ) ) {
+                       $dbr = wfGetDB( DB_SLAVE );
+                       $sql = $this->getSQLText( $dbr, $result->namespace, $result->title );
+                       $res = $dbr->query( $sql, $fname );
+                       if ( $res ) {
+                               $result = $dbr->fetchObject( $res );
+                               $dbr->freeResult( $res );
+                       }
+               }
+               if ( !$result ) {
+                       return '';
                }
 
-               return implode( ' ', $parts );
+               $titleB = Title::makeTitle( $result->nsb, $result->tb );
+               $titleC = Title::makeTitle( $result->nsc, $result->tc );
+
+               $linkA = $skin->makeKnownLinkObj( $titleA,'', 'redirect=no' );
+               $edit = $skin->makeBrokenLinkObj( $titleA, "(".wfMsg("qbedit").")" , 'redirect=no');
+               $linkB = $skin->makeKnownLinkObj( $titleB, '', 'redirect=no' );
+               $linkC = $skin->makeKnownLinkObj( $titleC );
+               $arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
+
+               return( "{$linkA} {$edit} {$arr} {$linkB} {$arr} {$linkC}" );
        }
 }
 
@@ -84,6 +95,10 @@ class DoubleRedirectsPage extends PageQueryPage {
  */
 function wfSpecialDoubleRedirects() {
        list( $limit, $offset ) = wfCheckLimits();
+
        $sdr = new DoubleRedirectsPage();
+
        return $sdr->doQuery( $offset, $limit );
-}
\ No newline at end of file
+
+}
+

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1fffd8b..867219b 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1572,7 +1572,7 @@ The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''\$7''
 
 'doubleredirects'         => 'Double redirects',
 'doubleredirects-summary' => '', # only translate this message to other languages if you have to change it
-'doubleredirectstext'     => 'The following redirects link to other redirect pages:',
+'doubleredirectstext'     => 'Each row contains links to the first and second redirect, as well as the target of the second redirect, which is usually "real" target page, which the first redirect should point to.',
 
 'brokenredirects'         => 'Broken redirects',
 'brokenredirects-summary' => '', # only translate this message to other languages if you have to change it