* (bug 11342) Fix several 'returnto' links in permissions/error pages which

  linked to the main page instead of targetted page

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e2133b0..9f4cb70 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -54,6 +54,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11321) Fix width of gallerybox when option "width=xxx" is used
 * (bug 7890) Special:BrokenRedirects links deleted redirects to a non-existent page
 * Fix initial statistics when installing: add correct values
+* (bug 11342) Fix several 'returnto' links in permissions/error pages which
+  linked to the main page instead of targetted page
+
 
 === API changes in 1.12 ===
 

diff --git a/includes/Article.php b/includes/Article.php
index f83b17b..756a763 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2025,7 +2025,7 @@ class Article {
        <input type='hidden' name='wpEditToken' value=\"{$token}\" />
 </form>\n" );
 
-               $wgOut->returnToMain( false );
+               $wgOut->returnToMain( false, $this->mTitle );
 
                $this->showLogExtract( $wgOut );
        }

diff --git a/includes/EditPage.php b/includes/EditPage.php
index e878617..2d9ef98 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1494,7 +1494,7 @@ END
                $wgOut->setArticleRelated( false );
 
                $wgOut->addHtml( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) );
-               $wgOut->returnToMain( false, $this->mTitle->getPrefixedUrl() );
+               $wgOut->returnToMain( false, $this->mTitle );
        }
 
        /**
@@ -1510,7 +1510,7 @@ END
                $wgOut->setArticleRelated( false );
 
                $wgOut->addWikiText( wfMsg( 'confirmedittext' ) );
-               $wgOut->returnToMain( false );
+               $wgOut->returnToMain( false, $this->mTitle );
        }
 
        /**
@@ -1525,7 +1525,7 @@ END
                $wgOut->setArticleRelated( false );
 
                $wgOut->addWikiText( wfMsg( 'nosuchsectiontext', $this->section ) );
-               $wgOut->returnToMain( false, $this->mTitle->getPrefixedUrl() );
+               $wgOut->returnToMain( false, $this->mTitle );
        }
 
        /**
@@ -1544,7 +1544,7 @@ END
                if ( $match )
                        $wgOut->addWikiText( wfMsg( 'spamprotectionmatch', "<nowiki>{$match}</nowiki>" ) );
 
-               $wgOut->returnToMain( false );
+               $wgOut->returnToMain( false, $this->mTitle );
        }
 
        /**

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3f69fab..60cf395 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1060,7 +1060,7 @@ class OutputPage {
                $article = new Article( $wgTitle );
                $this->addHTML( $skin->formatTemplates( $article->getUsedTemplates() ) );
 
-               $this->returnToMain( false );
+               $this->returnToMain( false, $wgTitle );
        }
 
        /** @deprecated */

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 70619d5..1568ea4 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -189,7 +189,7 @@ class LoginForm {
                        $wgOut->setArticleRelated( false );
                        $wgOut->setRobotPolicy( 'noindex,nofollow' );
                        $wgOut->addHtml( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) );
-                       $wgOut->returnToMain( $self->getPrefixedText() );
+                       $wgOut->returnToMain( false, $self );
                        wfRunHooks( 'AddNewAccount', array( $u ) );
                        return true;
                }