* Store the value of the page.page_restrictions field in Title::loadFromRow() and...

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

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 0789f55..195e106 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -197,7 +197,7 @@ class UserMailer {
                $ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) );
                if ( $ret === false ) {
                        return Status::newGood();
-               } else if ( $ret !== true ) {
+               } elseif ( $ret !== true ) {
                        return Status::newFatal( 'php-mail-error', $ret );
                }
 
@@ -348,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.
@@ -632,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;