(reopened bug 5284) Handle cases like Special:Mypage/monobook.js&action=edit

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 9afba68..bf6c745 100644 (file)
--- 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' );