| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2025,7 +2025,7 @@ |
| 2026 | 2026 | <input type='hidden' name='wpEditToken' value=\"{$token}\" /> |
| 2027 | 2027 | </form>\n" ); |
| 2028 | 2028 | |
| 2029 | | - $wgOut->returnToMain( false ); |
| | 2029 | + $wgOut->returnToMain( false, $this->mTitle ); |
| 2030 | 2030 | |
| 2031 | 2031 | $this->showLogExtract( $wgOut ); |
| 2032 | 2032 | } |
| Index: trunk/phase3/includes/SpecialUserlogin.php |
| — | — | @@ -189,7 +189,7 @@ |
| 190 | 190 | $wgOut->setArticleRelated( false ); |
| 191 | 191 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 192 | 192 | $wgOut->addHtml( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) ); |
| 193 | | - $wgOut->returnToMain( $self->getPrefixedText() ); |
| | 193 | + $wgOut->returnToMain( false, $self ); |
| 194 | 194 | wfRunHooks( 'AddNewAccount', array( $u ) ); |
| 195 | 195 | return true; |
| 196 | 196 | } |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1494,7 +1494,7 @@ |
| 1495 | 1495 | $wgOut->setArticleRelated( false ); |
| 1496 | 1496 | |
| 1497 | 1497 | $wgOut->addHtml( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) ); |
| 1498 | | - $wgOut->returnToMain( false, $this->mTitle->getPrefixedUrl() ); |
| | 1498 | + $wgOut->returnToMain( false, $this->mTitle ); |
| 1499 | 1499 | } |
| 1500 | 1500 | |
| 1501 | 1501 | /** |
| — | — | @@ -1510,7 +1510,7 @@ |
| 1511 | 1511 | $wgOut->setArticleRelated( false ); |
| 1512 | 1512 | |
| 1513 | 1513 | $wgOut->addWikiText( wfMsg( 'confirmedittext' ) ); |
| 1514 | | - $wgOut->returnToMain( false ); |
| | 1514 | + $wgOut->returnToMain( false, $this->mTitle ); |
| 1515 | 1515 | } |
| 1516 | 1516 | |
| 1517 | 1517 | /** |
| — | — | @@ -1525,7 +1525,7 @@ |
| 1526 | 1526 | $wgOut->setArticleRelated( false ); |
| 1527 | 1527 | |
| 1528 | 1528 | $wgOut->addWikiText( wfMsg( 'nosuchsectiontext', $this->section ) ); |
| 1529 | | - $wgOut->returnToMain( false, $this->mTitle->getPrefixedUrl() ); |
| | 1529 | + $wgOut->returnToMain( false, $this->mTitle ); |
| 1530 | 1530 | } |
| 1531 | 1531 | |
| 1532 | 1532 | /** |
| — | — | @@ -1544,7 +1544,7 @@ |
| 1545 | 1545 | if ( $match ) |
| 1546 | 1546 | $wgOut->addWikiText( wfMsg( 'spamprotectionmatch', "<nowiki>{$match}</nowiki>" ) ); |
| 1547 | 1547 | |
| 1548 | | - $wgOut->returnToMain( false ); |
| | 1548 | + $wgOut->returnToMain( false, $this->mTitle ); |
| 1549 | 1549 | } |
| 1550 | 1550 | |
| 1551 | 1551 | /** |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1060,7 +1060,7 @@ |
| 1061 | 1061 | $article = new Article( $wgTitle ); |
| 1062 | 1062 | $this->addHTML( $skin->formatTemplates( $article->getUsedTemplates() ) ); |
| 1063 | 1063 | |
| 1064 | | - $this->returnToMain( false ); |
| | 1064 | + $this->returnToMain( false, $wgTitle ); |
| 1065 | 1065 | } |
| 1066 | 1066 | |
| 1067 | 1067 | /** @deprecated */ |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -54,7 +54,10 @@ |
| 55 | 55 | * (bug 11321) Fix width of gallerybox when option "width=xxx" is used |
| 56 | 56 | * (bug 7890) Special:BrokenRedirects links deleted redirects to a non-existent page |
| 57 | 57 | * Fix initial statistics when installing: add correct values |
| | 58 | +* (bug 11342) Fix several 'returnto' links in permissions/error pages which |
| | 59 | + linked to the main page instead of targetted page |
| 58 | 60 | |
| | 61 | + |
| 59 | 62 | === API changes in 1.12 === |
| 60 | 63 | |
| 61 | 64 | Full API documentation is available at http://www.mediawiki.org/wiki/API |