X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FUserMailer.php;h=195e1066ce26af4ba2a04f84edd63083a35c3820;hb=68bf1a77b4b1f1465a72ae3edffb19ae28da2765;hp=0789f555d35843189d2efa004fcdb7eb8ba39713;hpb=e27527f3f19b6f8fca5f546a31785e0c7f3537ef;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 0789f555d3..195e1066ce 100644
--- 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;