Revision: 48625
Author:   nikerabbit
Date:     2009-03-20 06:11:04 +0000 (Fri, 20 Mar 2009)

Log Message:
-----------
* Don't use wgLang for dates in emails

Modified Paths:
--------------
    trunk/phase3/includes/UserMailer.php

Modified: trunk/phase3/includes/UserMailer.php
===================================================================
--- trunk/phase3/includes/UserMailer.php        2009-03-20 04:29:49 UTC (rev 
48624)
+++ trunk/phase3/includes/UserMailer.php        2009-03-20 06:11:04 UTC (rev 
48625)
@@ -557,7 +557,7 @@
         * @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 <[email protected]>".
                //     The mail command will not parse this properly while 
talking with the MTA.
@@ -571,7 +571,7 @@
                # 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 ),
+                       $wgContLang->timeanddate( $this->timestamp, true, 
false, $timecorrection ),
                        $body);
 
                return UserMailer::send($to, $this->from, $this->subject, 
$body, $this->replyto);
@@ -582,7 +582,7 @@
         * mailing.  Takes an array of MailAddress objects.
         */
        function sendImpersonal( $addresses ) {
-               global $wgLang;
+               global $wgContLang;
 
                if (empty($addresses))
                        return;
@@ -591,7 +591,7 @@
                                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);



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to