| Index: branches/wmf/1.18wmf1/extensions/Contest/includes/ContestContestant.php |
| — | — | @@ -492,8 +492,8 @@ |
| 493 | 493 | $title = wfMsg( 'contest-email-signup-title' ); |
| 494 | 494 | $emailText = ContestUtils::getParsedArticleContent( $this->getContest()->getField( 'signup_email' ) ); |
| 495 | 495 | $user = $this->getUser(); |
| 496 | | - $sender = ContestSettings::get( 'wgPasswordSender' ); |
| 497 | | - $senderName = ContestSettings::get( 'wgPasswordSenderName' ); |
| | 496 | + $sender = ContestSettings::get( 'mailSender' ); |
| | 497 | + $senderName = ContestSettings::get( 'mailSenderName' ); |
| 498 | 498 | |
| 499 | 499 | wfRunHooks( 'ContestBeforeSignupEmail', array( &$this, &$title, &$emailText, &$user, &$sender, &$senderName ) ); |
| 500 | 500 | |
| — | — | @@ -521,8 +521,8 @@ |
| 522 | 522 | |
| 523 | 523 | $title = wfMsgExt( 'contest-email-reminder-title', 'parsemag', $params['daysLeft'] ); |
| 524 | 524 | $user = $this->getUser(); |
| 525 | | - $sender = ContestSettings::get( 'wgPasswordSender' ); |
| 526 | | - $senderName = ContestSettings::get( 'wgPasswordSenderName' ); |
| | 525 | + $sender = ContestSettings::get( 'mailSender' ); |
| | 526 | + $senderName = ContestSettings::get( 'mailSenderName' ); |
| 527 | 527 | |
| 528 | 528 | wfRunHooks( 'ContestBeforeReminderEmail', array( &$this, &$title, &$emailText, &$user, &$sender, &$senderName ) ); |
| 529 | 529 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/Contest/includes/ContestContestant.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 530 | 530 | Merged /branches/sqlite/extensions/Contest/includes/ContestContestant.php:r58211-58321 |
| 531 | 531 | Merged /trunk/phase3/extensions/Contest/includes/ContestContestant.php:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656 |
| 532 | 532 | Merged /branches/new-installer/phase3/extensions/Contest/includes/ContestContestant.php:r43664-66004 |
| 533 | 533 | Merged /branches/REL1_15/phase3/extensions/Contest/includes/ContestContestant.php:r51646 |
| 534 | 534 | Merged /branches/REL1_17/phase3/extensions/Contest/includes/ContestContestant.php:r81445,81448 |
| 535 | 535 | Merged /trunk/extensions/Contest/includes/ContestContestant.php:r99592,99653,100324,100399,100402,100405,100419,100427,100432-100433,100435-100439,100442 |