http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100292
Revision: 100292
Author: reedy
Date: 2011-10-19 23:30:29 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
Added new globals to override the email sender address/name, defaults to MW
$$wgContestMailSender and $wgContestMailSenderName
Modified Paths:
--------------
trunk/extensions/Contest/Contest.php
trunk/extensions/Contest/includes/ContestContestant.php
Modified: trunk/extensions/Contest/Contest.php
===================================================================
--- trunk/extensions/Contest/Contest.php 2011-10-19 23:17:41 UTC (rev
100291)
+++ trunk/extensions/Contest/Contest.php 2011-10-19 23:30:29 UTC (rev
100292)
@@ -165,7 +165,7 @@
'contest-contest-reminder-send',
'contest-contest-reminder-preview',
'contest-contest-reminder-sending',
- 'contest-contest-reminder-success',
+ 'contest-contest-reminder-success',
'contest-contest-reminder-close',
'contest-contest-reminder-retry',
'contest-contest-reminder-failed',
@@ -294,3 +294,6 @@
$egContestSettings = array();
$wgContestEmailParse = false;
+
+$wgContestMailSender = $wgPasswordSender;
+$wgContestMailSenderName = $wgPasswordSenderName;
Modified: trunk/extensions/Contest/includes/ContestContestant.php
===================================================================
--- trunk/extensions/Contest/includes/ContestContestant.php 2011-10-19
23:17:41 UTC (rev 100291)
+++ trunk/extensions/Contest/includes/ContestContestant.php 2011-10-19
23:30:29 UTC (rev 100292)
@@ -489,13 +489,13 @@
* @return Status
*/
public function sendSignupEmail() {
- global $wgPasswordSender, $wgPasswordSenderName;
+ global $wgContestMailSender, $wgContestMailSenderName;
$title = wfMsg( 'contest-email-signup-title' );
$emailText = ContestUtils::getParsedArticleContent(
$this->getContest()->getField( 'signup_email' ) );
$user = $this->getUser();
- $sender = $wgPasswordSender;
- $senderName = $wgPasswordSenderName;
+ $sender = $wgContestMailSender;
+ $senderName = $wgContestMailSenderName;
wfRunHooks( 'ContestBeforeSignupEmail', array( &$this, &$title,
&$emailText, &$user, &$sender, &$senderName ) );
@@ -517,7 +517,7 @@
* @return Status
*/
public function sendReminderEmail( $emailText, array $params = array()
) {
- global $wgPasswordSender, $wgPasswordSenderName;
+ global $wgContestMailSender, $wgContestMailSenderName;
if ( !array_key_exists( 'daysLeft', $params ) ) {
$params['daysLeft'] =
$this->getContest()->getDaysLeft();
@@ -525,8 +525,8 @@
$title = wfMsgExt( 'contest-email-reminder-title', 'parsemag',
$params['daysLeft'] );
$user = $this->getUser();
- $sender = $wgPasswordSender;
- $senderName = $wgPasswordSenderName;
+ $sender = $wgContestMailSender;
+ $senderName = $wgContestMailSenderName;
wfRunHooks( 'ContestBeforeReminderEmail', array( &$this,
&$title, &$emailText, &$user, &$sender, &$senderName ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
