From 5c7787598ece6c3333922e9d67007cba53d913fd Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Tue, 10 Jul 2007 21:47:36 +0000
Subject: [PATCH] (bug 9151) Remove timed redirects on "Return to X" pages for
 accessibility.

---
 RELEASE-NOTES           | 1 +
 includes/OutputPage.php | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6a0b0650fa..d8e4cfb66a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -130,6 +130,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   prevents page editing
 * (bug 9936) Per-edit suppression of preview-on-first edit with "preview=no"
 * Allow showing a one-off preview on first edit with "preview=yes"
+* (bug 9151) Remove timed redirects on "Return to X" pages for accessibility.
 
 == Bugfixes since 1.10 ==
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index ffc10b2111..fc7a621e37 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1072,10 +1072,10 @@ class OutputPage {
 
 	/**
 	 * return from error messages or notes
-	 * @param $auto automatically redirect the user after 10 seconds
+	 * @param $unused No longer used
 	 * @param $returnto page title to return to. Default is Main Page.
 	 */
-	public function returnToMain( $auto = true, $returnto = NULL ) {
+	public function returnToMain( $unused = null, $returnto = NULL ) {
 		global $wgUser, $wgOut, $wgRequest;
 		
 		if ( $returnto == NULL ) {
@@ -1099,9 +1099,6 @@ class OutputPage {
 		$link = $sk->makeLinkObj( $titleObj, '' );
 
 		$r = wfMsg( 'returnto', $link );
-		if ( $auto ) {
-			$wgOut->addMeta( 'http:Refresh', '10;url=' . $titleObj->escapeFullURL() );
-		}
 		$wgOut->addHTML( "\n<p>$r</p>\n" );
 	}
 
-- 
2.20.1