From ee0e2d60e21df1c58f2247d5eb848f0ade018248 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Tue, 9 May 2006 15:22:12 +0000
Subject: [PATCH] (reopened bug 5284) Handle cases like
 Special:Mypage/monobook.js&action=edit

---
 includes/SpecialPage.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 9afba689db..bf6c74582e 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -276,16 +276,18 @@ class SpecialPage
 			} else {
 				$redir = SpecialPage::getRedirect( $name );
 				if ( isset( $redir ) ) {
+					if( $par )
+						$redir = Title::makeTitle( $redir->getNamespace(), $redir->getText() . '/' . $par );
 					$params = SpecialPage::getRedirectParams( $name );
 					if( $params ) {
 						$url = $redir->getFullUrl( $params );
-					} elseif( $par ) {
-						$url = $redir->getFullUrl() . '/' . $par;
 					} else {
 						$url = $redir->getFullUrl();
 					}
 					$wgOut->redirect( $url );
 					$retVal = $redir;
+					$wgOut->redirect( $url );
+					$retVal = $redir;
 				} else {
 					$wgOut->setArticleRelated( false );
 					$wgOut->setRobotpolicy( 'noindex,follow' );
-- 
2.20.1