| Index: trunk/extensions/Contest/Contest.php |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | 'contest-contest-reminder-send', |
| 167 | 167 | 'contest-contest-reminder-preview', |
| 168 | 168 | 'contest-contest-reminder-sending', |
| 169 | | - 'contest-contest-reminder-success', |
| | 169 | + 'contest-contest-reminder-success', |
| 170 | 170 | 'contest-contest-reminder-close', |
| 171 | 171 | 'contest-contest-reminder-retry', |
| 172 | 172 | 'contest-contest-reminder-failed', |
| — | — | @@ -294,3 +294,6 @@ |
| 295 | 295 | $egContestSettings = array(); |
| 296 | 296 | |
| 297 | 297 | $wgContestEmailParse = false; |
| | 298 | + |
| | 299 | +$wgContestMailSender = $wgPasswordSender; |
| | 300 | +$wgContestMailSenderName = $wgPasswordSenderName; |
| Index: trunk/extensions/Contest/includes/ContestContestant.php |
| — | — | @@ -489,13 +489,13 @@ |
| 490 | 490 | * @return Status |
| 491 | 491 | */ |
| 492 | 492 | public function sendSignupEmail() { |
| 493 | | - global $wgPasswordSender, $wgPasswordSenderName; |
| | 493 | + global $wgContestMailSender, $wgContestMailSenderName; |
| 494 | 494 | |
| 495 | 495 | $title = wfMsg( 'contest-email-signup-title' ); |
| 496 | 496 | $emailText = ContestUtils::getParsedArticleContent( $this->getContest()->getField( 'signup_email' ) ); |
| 497 | 497 | $user = $this->getUser(); |
| 498 | | - $sender = $wgPasswordSender; |
| 499 | | - $senderName = $wgPasswordSenderName; |
| | 498 | + $sender = $wgContestMailSender; |
| | 499 | + $senderName = $wgContestMailSenderName; |
| 500 | 500 | |
| 501 | 501 | wfRunHooks( 'ContestBeforeSignupEmail', array( &$this, &$title, &$emailText, &$user, &$sender, &$senderName ) ); |
| 502 | 502 | |
| — | — | @@ -517,7 +517,7 @@ |
| 518 | 518 | * @return Status |
| 519 | 519 | */ |
| 520 | 520 | public function sendReminderEmail( $emailText, array $params = array() ) { |
| 521 | | - global $wgPasswordSender, $wgPasswordSenderName; |
| | 521 | + global $wgContestMailSender, $wgContestMailSenderName; |
| 522 | 522 | |
| 523 | 523 | if ( !array_key_exists( 'daysLeft', $params ) ) { |
| 524 | 524 | $params['daysLeft'] = $this->getContest()->getDaysLeft(); |
| — | — | @@ -525,8 +525,8 @@ |
| 526 | 526 | |
| 527 | 527 | $title = wfMsgExt( 'contest-email-reminder-title', 'parsemag', $params['daysLeft'] ); |
| 528 | 528 | $user = $this->getUser(); |
| 529 | | - $sender = $wgPasswordSender; |
| 530 | | - $senderName = $wgPasswordSenderName; |
| | 529 | + $sender = $wgContestMailSender; |
| | 530 | + $senderName = $wgContestMailSenderName; |
| 531 | 531 | |
| 532 | 532 | wfRunHooks( 'ContestBeforeReminderEmail', array( &$this, &$title, &$emailText, &$user, &$sender, &$senderName ) ); |
| 533 | 533 | |