Remove rel="next" that accompanied returnto.

Removed rel="next" link that was put on every
page that had a returnto because otherwise
Firefox (and possibly others) might prefetch
the page, which is not desired in returnto
situations.

Bug: 46680
Change-Id: Ifaf40c663dc25e51bffc317144d9bdc1dab21785

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 8835576..131f9c4 100644 (file)
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -354,6 +354,8 @@ changes to languages because of Bugzilla reports.
 * BREAKING CHANGE: The Services_JSON class has been removed; if necessary,
   be sure to upgrade affected extensions at the same time (e.g. Collection).
 * Calling Linker methods using a skin will now output deprecation warnings.
+* Pages with a returnto (such as the page when you login or logout), no
+  longer have a rel="next" link tag.
 
 == Compatibility ==
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 905b005..0099461 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2401,7 +2401,6 @@ $templates
                        $proto = PROTO_RELATIVE;
                }
 
-               $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullURL( '', false, $proto ) ) );
                $link = $this->msg( 'returnto' )->rawParams(
                        Linker::link( $title, $text, array(), $query, $options ) )->escaped();
                $this->addHTML( "<p id=\"mw-returnto\">{$link}</p>\n" );