| Index: trunk/phase3/includes/SpecialUserlogin.php |
| — | — | @@ -151,7 +151,7 @@ |
| 152 | 152 | wfRunHooks( 'AddNewAccount' ); |
| 153 | 153 | |
| 154 | 154 | if( $this->hasSessionCookie() ) { |
| 155 | | - return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) ); |
| | 155 | + return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ), false ); |
| 156 | 156 | } else { |
| 157 | 157 | return $this->cookieRedirectCheck( 'new' ); |
| 158 | 158 | } |
| — | — | @@ -407,10 +407,11 @@ |
| 408 | 408 | |
| 409 | 409 | |
| 410 | 410 | /** |
| 411 | | - * @param string $msg Message that will be shown on success. |
| | 411 | + * @param string $msg Message that will be shown on success |
| | 412 | + * @param bool $auto Toggle auto-redirect to main page; default true |
| 412 | 413 | * @access private |
| 413 | 414 | */ |
| 414 | | - function successfulLogin( $msg ) { |
| | 415 | + function successfulLogin( $msg, $auto = true ) { |
| 415 | 416 | global $wgUser; |
| 416 | 417 | global $wgOut; |
| 417 | 418 | |
| — | — | @@ -422,7 +423,7 @@ |
| 423 | 424 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 424 | 425 | $wgOut->setArticleRelated( false ); |
| 425 | 426 | $wgOut->addWikiText( $msg ); |
| 426 | | - $wgOut->returnToMain(); |
| | 427 | + $wgOut->returnToMain( $auto ); |
| 427 | 428 | } |
| 428 | 429 | |
| 429 | 430 | /** */ |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -604,6 +604,7 @@ |
| 605 | 605 | * (bug 4842) Fix 'show number of watching users' with enhanced RC |
| 606 | 606 | * (bug 4889) Fix image talk namespace for Tamil |
| 607 | 607 | * (bug 4147) Added cleanupWatchlist.php to clear out bogus watchlist entries |
| | 608 | +* (partial bug 3456) Disable auto redirect to Main Page after account creation |
| 608 | 609 | |
| 609 | 610 | |
| 610 | 611 | === Caveats === |