| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -431,11 +431,17 @@ |
| 432 | 432 | # Do not send multiple times, don't send for "spam" requests |
| 433 | 433 | if( !$row->acr_rejected && $this->submitType != 'spam' ) { |
| 434 | 434 | if( $this->reason ) { |
| 435 | | - $result = $u->sendMail( wfMsg( 'confirmaccount-email-subj' ), |
| 436 | | - wfMsgExt( 'confirmaccount-email-body4', array('parsemag'), $u->getName(), $this->reason ) ); |
| | 435 | + $result = $u->sendMail( |
| | 436 | + wfMsgForContent( 'confirmaccount-email-subj' ), |
| | 437 | + wfMsgExt( 'confirmaccount-email-body4', |
| | 438 | + array('parsemag','content'), $u->getName(), $this->reason ) |
| | 439 | + ); |
| 437 | 440 | } else { |
| 438 | | - $result = $u->sendMail( wfMsg( 'confirmaccount-email-subj' ), |
| 439 | | - wfMsgExt( 'confirmaccount-email-body3', array('parsemag'), $u->getName() ) ); |
| | 441 | + $result = $u->sendMail( |
| | 442 | + wfMsgForContent( 'confirmaccount-email-subj' ), |
| | 443 | + wfMsgExt( 'confirmaccount-email-body3', |
| | 444 | + array('parsemag','content'), $u->getName() ) |
| | 445 | + ); |
| 440 | 446 | } |
| 441 | 447 | |
| 442 | 448 | if( WikiError::isError( $result ) ) { |
| — | — | @@ -568,23 +574,27 @@ |
| 569 | 575 | $msg = "confirmaccount-email-body2-pos{$this->mType}"; |
| 570 | 576 | # If the user is in a group and there is a welcome for that group, use it |
| 571 | 577 | if( $group && !wfEmptyMsg( $msg, wfMsg($msg) ) ) { |
| 572 | | - $ebody = wfMsgExt($msg, array('parsemag'), $user->getName(), $p, $this->reason ); |
| | 578 | + $ebody = wfMsgExt( $msg, array('parsemag','content'), |
| | 579 | + $user->getName(), $p, $this->reason ); |
| 573 | 580 | # Use standard if none found... |
| 574 | 581 | } else { |
| 575 | | - $ebody = wfMsgExt( 'confirmaccount-email-body2', array('parsemag'), $user->getName(), $p, $this->reason ); |
| | 582 | + $ebody = wfMsgExt( 'confirmaccount-email-body2', |
| | 583 | + array('parsemag','content'), $user->getName(), $p, $this->reason ); |
| 576 | 584 | } |
| 577 | 585 | } else { |
| 578 | 586 | $msg = "confirmaccount-email-body-pos{$this->mType}"; |
| 579 | 587 | # If the user is in a group and there is a welcome for that group, use it |
| 580 | 588 | if( $group && !wfEmptyMsg( $msg, wfMsg($msg) ) ) { |
| 581 | | - $ebody = wfMsgExt($msg, array('parsemag'), $user->getName(), $p, $this->reason ); |
| | 589 | + $ebody = wfMsgExt($msg, array('parsemag','content'), |
| | 590 | + $user->getName(), $p, $this->reason ); |
| 582 | 591 | # Use standard if none found... |
| 583 | 592 | } else { |
| 584 | | - $ebody = wfMsgExt( 'confirmaccount-email-body', array('parsemag'), $user->getName(), $p, $this->reason ); |
| | 593 | + $ebody = wfMsgExt( 'confirmaccount-email-body', |
| | 594 | + array('parsemag','content'), $user->getName(), $p, $this->reason ); |
| 585 | 595 | } |
| 586 | 596 | } |
| 587 | 597 | |
| 588 | | - $result = $user->sendMail( wfMsg( 'confirmaccount-email-subj' ), $ebody ); |
| | 598 | + $result = $user->sendMail( wfMsgForContent( 'confirmaccount-email-subj' ), $ebody ); |
| 589 | 599 | |
| 590 | 600 | // init $error |
| 591 | 601 | $error = ''; |
| — | — | @@ -707,8 +717,11 @@ |
| 708 | 718 | |
| 709 | 719 | # Do not send multiple times |
| 710 | 720 | if( !$row->acr_held && !($row->acr_deleted && $row->acr_deleted !='f') ) { |
| 711 | | - $result = $u->sendMail( wfMsg( 'confirmaccount-email-subj' ), |
| 712 | | - wfMsgExt( 'confirmaccount-email-body5', array('parsemag'), $u->getName(), $this->reason ) ); |
| | 721 | + $result = $u->sendMail( |
| | 722 | + wfMsgForContent( 'confirmaccount-email-subj' ), |
| | 723 | + wfMsgExt( 'confirmaccount-email-body5', |
| | 724 | + array('parsemag','content'), $u->getName(), $this->reason ) |
| | 725 | + ); |
| 713 | 726 | if( WikiError::isError( $result ) ) { |
| 714 | 727 | $dbw->rollback(); |
| 715 | 728 | $error = wfMsg( 'mailerror', htmlspecialchars( $result->toString() ) ); |