Jump to content

Wikia code/includes/specials/SpecialEmailuser.php

From mediawiki.org
--- D:\Programming\SVN\mediawiki\branches\REL1_16\phase3\includes\specials\SpecialEmailuser.php	2011-07-18 22:31:17.835937500 +0100
+++ D:\Programming\SVN\wikia\trunk\includes\specials\SpecialEmailuser.php	2011-08-17 15:28:16.486328100 +0100
@@ -210,7 +210,7 @@
 				$replyTo = null;
 			}
 			
-			$mailResult = UserMailer::send( $to, $mailFrom, $subject, $this->text, $replyTo );
+			$mailResult = UserMailer::send( $to, $mailFrom, $subject, $this->text, $replyTo, null, 'EmailUser' );
 
 			if( WikiError::isError( $mailResult ) ) {
 				return $mailResult;
@@ -222,7 +222,7 @@
 				if ($this->cc_me && $to != $from) {
 					$cc_subject = wfMsg('emailccsubject', $this->target->getName(), $subject);
 					if( wfRunHooks( 'EmailUser', array( &$from, &$from, &$cc_subject, &$this->text ) ) ) {
-						$ccResult = UserMailer::send( $from, $from, $cc_subject, $this->text );
+						$ccResult = UserMailer::send( $from, $from, $cc_subject, $this->text, null, null, 'EmailUser' );
 						if( WikiError::isError( $ccResult ) ) {
 							// At this stage, the user's CC mail has failed, but their
 							// original mail has succeeded. It's unlikely, but still, what to do?