| Index: branches/REL1_17/phase3/includes/OutputPage.php |
| — | — | @@ -1940,7 +1940,7 @@ |
| 1941 | 1941 | * Produce the stock "please login to use the wiki" page |
| 1942 | 1942 | */ |
| 1943 | 1943 | public function loginToUse() { |
| 1944 | | - global $wgUser; |
| | 1944 | + global $wgUser, $wgRequest; |
| 1945 | 1945 | |
| 1946 | 1946 | if( $wgUser->isLoggedIn() ) { |
| 1947 | 1947 | $this->permissionRequired( 'read' ); |
| — | — | @@ -1954,12 +1954,18 @@ |
| 1955 | 1955 | $this->setRobotPolicy( 'noindex,nofollow' ); |
| 1956 | 1956 | $this->setArticleFlag( false ); |
| 1957 | 1957 | |
| | 1958 | + $returnto = Title::newFromURL( $wgRequest->getVal( 'title', '' ) ); |
| | 1959 | + $returntoquery = array(); |
| | 1960 | + if( $returnto ) { |
| | 1961 | + $returntoquery = array( 'returnto' => $returnto->getPrefixedText() ); |
| | 1962 | + } |
| | 1963 | + |
| 1958 | 1964 | $loginTitle = SpecialPage::getTitleFor( 'Userlogin' ); |
| 1959 | 1965 | $loginLink = $skin->link( |
| 1960 | 1966 | $loginTitle, |
| 1961 | 1967 | wfMsgHtml( 'loginreqlink' ), |
| 1962 | 1968 | array(), |
| 1963 | | - array( 'returnto' => $this->getTitle()->getPrefixedText() ), |
| | 1969 | + $returntoquery, |
| 1964 | 1970 | array( 'known', 'noclasses' ) |
| 1965 | 1971 | ); |
| 1966 | 1972 | $this->addHTML( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) ); |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -3,6 +3,17 @@ |
| 4 | 4 | Security reminder: MediaWiki does not require PHP's register_globals |
| 5 | 5 | setting since version 1.2.0. If you have it on, turn it '''off''' if you can. |
| 6 | 6 | |
| | 7 | +== MediaWiki 1.17.2 == |
| | 8 | + |
| | 9 | +????-??-?? |
| | 10 | + |
| | 11 | +This is a maintenance release of the MediaWiki 1.17 branch. |
| | 12 | + |
| | 13 | +=== Changes since 1.17.1 === |
| | 14 | + |
| | 15 | +* (32709) Private Wiki users were always taken to Special:Badtitle on login |
| | 16 | + |
| | 17 | + |
| 7 | 18 | == MediaWiki 1.17.1 == |
| 8 | 19 | |
| 9 | 20 | 2011-11-24 |