| Index: trunk/extensions/ConfirmAccount/RequestAccount_body.php |
| — | — | @@ -486,7 +486,12 @@ |
| 487 | 487 | global $wgOut; |
| 488 | 488 | $wgOut->addHTML( wfMsgExt( 'acct_request_throttle_hit', 'parsemag', $limit ) ); |
| 489 | 489 | } |
| 490 | | - |
| | 490 | + |
| | 491 | + /** |
| | 492 | + * (a) Try to confirm an email address via a token |
| | 493 | + * (b) Notify $wgConfirmAccountContact on success |
| | 494 | + * @param int $limit number of accounts allowed to be requested from the same IP |
| | 495 | + */ |
| 491 | 496 | protected function confirmEmailToken( $code ) { |
| 492 | 497 | global $wgUser, $wgOut, $wgConfirmAccountContact, $wgPasswordSender; |
| 493 | 498 | # Confirm if this token is in the pending requests |
| — | — | @@ -499,15 +504,16 @@ |
| 500 | 505 | $target = new MailAddress( $wgConfirmAccountContact ); |
| 501 | 506 | $source = new MailAddress( $wgPasswordSender ); |
| 502 | 507 | $title = SpecialPage::getTitleFor( 'ConfirmAccounts' ); |
| 503 | | - $subject = wfMsg( 'requestaccount-email-subj-admin' ); |
| 504 | | - $body = wfMsg( 'requestaccount-email-body-admin', $name, $title->getFullUrl() ); |
| | 508 | + $subject = wfMsgForContent( 'requestaccount-email-subj-admin' ); |
| | 509 | + $body = wfMsgForContent( |
| | 510 | + 'requestaccount-email-body-admin', $name, $title->getFullUrl() ); |
| 505 | 511 | # Actually send the email... |
| 506 | 512 | $result = UserMailer::send( $target, $source, $subject, $body ); |
| 507 | 513 | if ( WikiError::isError( $result ) ) { |
| 508 | 514 | wfDebug( "Could not sent email to admin at $target\n" ); |
| 509 | 515 | } |
| 510 | 516 | } |
| 511 | | - $wgOut->addWikiText( wfMsgHtml( 'request-account-econf' ) ); |
| | 517 | + $wgOut->addWikiMsg( 'request-account-econf' ); |
| 512 | 518 | $wgOut->returnToMain(); |
| 513 | 519 | return; |
| 514 | 520 | } |