* (bug 10985) Compromise solution; strike out resolved cached entries to avoid breaki...

* Tweak "doubleredirectstext"

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3b48b4a..acba6ca 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -422,7 +422,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11082) Fix check for fully-specced table names in Database::tableName
 * (bug 11067) Fix regression in upload conflict thumbnail display
 * (bug 11072) Fix regression in API image history query
-
+* (bug 10985) Resolved cached entries on Special:DoubleRedirects were being
+  supressed, breaking paging - now strikes out "fixed" results
 
 == API changes since 1.10 ==
 

diff --git a/includes/SpecialDoubleRedirects.php b/includes/SpecialDoubleRedirects.php
index a010a2b..6d46fc5 100644 (file)
--- a/includes/SpecialDoubleRedirects.php
+++ b/includes/SpecialDoubleRedirects.php
@@ -63,6 +63,7 @@ class DoubleRedirectsPage extends PageQueryPage {
        
                $fname = 'DoubleRedirectsPage::formatResult';
                $titleA = Title::makeTitle( $result->namespace, $result->title );
+               $linkA = $skin->makeKnownLinkObj( $titleA,'', 'redirect=no' );
 
                if ( $result && !isset( $result->nsb ) ) {
                        $dbr = wfGetDB( DB_SLAVE );
@@ -74,13 +75,12 @@ class DoubleRedirectsPage extends PageQueryPage {
                        }
                }
                if ( !$result ) {
-                       return '';
+                       return "<s>{$linkA}</s>\n";
                }
 
                $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 );

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7132c97..37a2ec8 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1560,7 +1560,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'     => '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.',
+'doubleredirectstext'     => 'This page lists pages which redirect to other redirect pages. 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