Fix retarded mistake in 57997, move break to within the if block or it defeats the...

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

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 55ab703..ce3ca9e 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -188,11 +188,12 @@ class UserMailer {
                                $headers .= "{$endl}Reply-To: " . $replyto->toString();
                        }
 
+                       wfDebug( "Sending mail via internal mail() function\n" );
+                       
                        $wgErrorString = '';
                        $html_errors = ini_get( 'html_errors' );
                        ini_set( 'html_errors', '0' );
                        set_error_handler( array( 'UserMailer', 'errorHandler' ) );
-                       wfDebug( "Sending mail via internal mail() function\n" );
 
                        if (function_exists('mail')) {
                                if (is_array($to)) {
@@ -263,9 +264,9 @@ class UserMailer {
  *
  */
 class EmailNotification {
-       private $to, $subject, $body, $replyto, $from;
-       private $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor;
-       private $mailTargets = array();
+       protected $to, $subject, $body, $replyto, $from;
+       protected $user, $title, $timestamp, $summary, $minorEdit, $oldid, $composed_common, $editor;
+       protected $mailTargets = array();
 
        /**
         * Send emails corresponding to the user $editor editing the page $title.
@@ -310,6 +311,8 @@ class EmailNotification {
                                        array( /* SET */
                                                'wl_notificationtimestamp' => $dbw->timestamp( $timestamp )
                                        ), array( /* WHERE */
+                                               'wl_title' => $title->getDBkey(),
+                                               'wl_namespace' => $title->getNamespace(),
                                                'wl_user' => $watchers
                                        ), __METHOD__
                                );
@@ -557,7 +560,7 @@ class EmailNotification {
         * @private
         */
        function sendPersonalised( $watchingUser ) {
-               global $wgLang, $wgEnotifUseRealName;
+               global $wgContLang, $wgEnotifUseRealName;
                // From the PHP manual:
                //     Note:  The to parameter cannot be an address in the form of "Something <someone@example.com>".
                //     The mail command will not parse this properly while talking with the MTA.
@@ -570,8 +573,13 @@ class EmailNotification {
                # $PAGEEDITDATE is the time and date of the page change
                # expressed in terms of individual local time of the notification
                # recipient, i.e. watching user
-               $body = str_replace('$PAGEEDITDATE',
-                       $wgLang->timeanddate( $this->timestamp, true, false, $timecorrection ),
+               $body = str_replace(
+                       array(  '$PAGEEDITDATEANDTIME',
+                               '$PAGEEDITDATE',
+                               '$PAGEEDITTIME' ),
+                       array(  $wgContLang->timeanddate( $this->timestamp, true, false, $timecorrection ),
+                               $wgContLang->date( $this->timestamp, true, false, $timecorrection ),
+                               $wgContLang->time( $this->timestamp, true, false, $timecorrection ) ),
                        $body);
 
                return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto);
@@ -582,7 +590,7 @@ class EmailNotification {
         * mailing.  Takes an array of MailAddress objects.
         */
        function sendImpersonal( $addresses ) {
-               global $wgLang;
+               global $wgContLang;
 
                if (empty($addresses))
                        return;
@@ -591,7 +599,7 @@ class EmailNotification {
                                array(  '$WATCHINGUSERNAME',
                                        '$PAGEEDITDATE'),
                                array(  wfMsgForContent('enotif_impersonal_salutation'),
-                                       $wgLang->timeanddate($this->timestamp, true, false, false)),
+                                       $wgContLang->timeanddate($this->timestamp, true, false, false)),
                                $this->body);
 
                return UserMailer::send($addresses, $this->from, $this->subject, $body, $this->replyto);