| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -252,10 +252,10 @@ |
| 253 | 253 | }
|
| 254 | 254 |
|
| 255 | 255 | /**
|
| 256 | | - * Get a request ID from an emailconfirm token
|
| | 256 | + * Get a request name from an emailconfirm token
|
| 257 | 257 | *
|
| 258 | | - * @param Sring $code
|
| 259 | | - * @returns Integer $reqID
|
| | 258 | + * @param sring $code
|
| | 259 | + * @returns string $name
|
| 260 | 260 | */
|
| 261 | 261 | function requestFromEmailToken( $code ) {
|
| 262 | 262 | $dbr = wfGetDB( DB_SLAVE );
|
| — | — | @@ -378,7 +378,7 @@ |
| 379 | 379 | $row = $this->getRequest();
|
| 380 | 380 | if( !$row ) {
|
| 381 | 381 | $wgOut->addHTML( wfMsg('confirmaccount-badid') );
|
| 382 | | - $wgOut->returnToMain( null, $wgTitle );
|
| | 382 | + $wgOut->returnToMain( true, $wgTitle );
|
| 383 | 383 | return;
|
| 384 | 384 | }
|
| 385 | 385 |
|
| — | — | @@ -440,7 +440,8 @@ |
| 441 | 441 | $dbw = wfGetDB( DB_MASTER );
|
| 442 | 442 | $dbw->update( 'user',
|
| 443 | 443 | array( 'user_email_authenticated' => $row->acr_email_authenticated,
|
| 444 | | - 'user_email_token_expires' => $row->acr_email_token_expires ),
|
| | 444 | + 'user_email_token_expires' => $row->acr_email_token_expires,
|
| | 445 | + 'user_email_token' => $row->acr_email_token ),
|
| 445 | 446 | array( 'user_id' => $user->getID() ),
|
| 446 | 447 | __METHOD__ );
|
| 447 | 448 | # OK, now remove the request
|
| — | — | @@ -471,7 +472,7 @@ |
| 472 | 473 | $row = $this->getRequest();
|
| 473 | 474 | if( !$row ) {
|
| 474 | 475 | $wgOut->addHTML( wfMsg('confirmaccount-badid') );
|
| 475 | | - $wgOut->returnToMain( null, $wgTitle );
|
| | 476 | + $wgOut->returnToMain( true, $wgTitle );
|
| 476 | 477 | return;
|
| 477 | 478 | }
|
| 478 | 479 |
|
| — | — | @@ -552,7 +553,7 @@ |
| 553 | 554 | else
|
| 554 | 555 | $wgOut->addWikiText( wfMsg( "confirmaccount-del" ) );
|
| 555 | 556 |
|
| 556 | | - $wgOut->returnToMain( null, $wgTitle );
|
| | 557 | + $wgOut->returnToMain( true, $wgTitle );
|
| 557 | 558 | }
|
| 558 | 559 |
|
| 559 | 560 | function showList() {
|