From 36bf5dbf9b89e0ecd8079abc78c78b9c9667b5ab Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 14 Apr 2010 19:27:25 +0000
Subject: [PATCH] * (bug 21456) "Bad title" error when showing non-local
 interwiki pages no longer displays incorrect tabs

---
 RELEASE-NOTES     | 2 ++
 includes/Wiki.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d6cc0ba286..f476592818 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -107,6 +107,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Maintenance script cleanupTitles is now able to fix titles stored
 in a negative namespace (which is invalid).
 * (bug 19858) Removed obsolete <big> in interface messages.
+* (bug 21456) "Bad title" error when showing non-local interwiki pages no longer
+  displays incorrect tabs
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent
diff --git a/includes/Wiki.php b/includes/Wiki.php
index de1f9db3e7..fa7a84cc54 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -207,6 +207,7 @@ class MediaWiki {
 				$output->redirect( $url );
 			} else {
 				$title = SpecialPage::getTitleFor( 'Badtitle' );
+				$output->setTitle( $title ); // bug 21456
 				wfProfileOut( __METHOD__ );
 				throw new ErrorPageError( 'badtitle', 'badtitletext' );
 			}
-- 
2.20.1