Followup r100905, cleanup per CR and fixes the overriding of the main RequestContext

[lhc/web/wiklou.git] / includes / UserMailer.php

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index fdb209f..f4b9d59 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -193,7 +193,6 @@ class UserMailer {
 
                $headers['Message-ID'] = self::makeMsgId();
                $headers['X-Mailer'] = 'MediaWiki mailer';
-               $headers['From'] = $from->toString();
 
                $ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) );
                if ( $ret === false ) {
@@ -349,9 +348,19 @@ class UserMailer {
  */
 class EmailNotification {
        protected $to, $subject, $body, $replyto, $from;
-       protected $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor;
+       protected $timestamp, $summary, $minorEdit, $oldid, $composed_common;
        protected $mailTargets = array();
 
+       /**
+        * @var Title
+        */
+       protected $title;
+
+       /**
+        * @var User
+        */
+       protected $user, $editor;
+
        /**
         * Send emails corresponding to the user $editor editing the page $title.
         * Also updates wl_notificationtimestamp.
@@ -633,6 +642,7 @@ class EmailNotification {
         * depending on settings.
         *
         * Call sendMails() to send any mails that were queued.
+        * @param $user User
         */
        function compose( $user ) {
                global $wgEnotifImpersonal;