| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -557,7 +557,7 @@ |
| 558 | 558 | * @private |
| 559 | 559 | */ |
| 560 | 560 | function sendPersonalised( $watchingUser ) { |
| 561 | | - global $wgLang, $wgEnotifUseRealName; |
| | 561 | + global $wgContLang, $wgEnotifUseRealName; |
| 562 | 562 | // From the PHP manual: |
| 563 | 563 | // Note: The to parameter cannot be an address in the form of "Something <someone@example.com>". |
| 564 | 564 | // The mail command will not parse this properly while talking with the MTA. |
| — | — | @@ -571,7 +571,7 @@ |
| 572 | 572 | # expressed in terms of individual local time of the notification |
| 573 | 573 | # recipient, i.e. watching user |
| 574 | 574 | $body = str_replace('$PAGEEDITDATE', |
| 575 | | - $wgLang->timeanddate( $this->timestamp, true, false, $timecorrection ), |
| | 575 | + $wgContLang->timeanddate( $this->timestamp, true, false, $timecorrection ), |
| 576 | 576 | $body); |
| 577 | 577 | |
| 578 | 578 | return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto); |
| — | — | @@ -582,7 +582,7 @@ |
| 583 | 583 | * mailing. Takes an array of MailAddress objects. |
| 584 | 584 | */ |
| 585 | 585 | function sendImpersonal( $addresses ) { |
| 586 | | - global $wgLang; |
| | 586 | + global $wgContLang; |
| 587 | 587 | |
| 588 | 588 | if (empty($addresses)) |
| 589 | 589 | return; |
| — | — | @@ -591,7 +591,7 @@ |
| 592 | 592 | array( '$WATCHINGUSERNAME', |
| 593 | 593 | '$PAGEEDITDATE'), |
| 594 | 594 | array( wfMsgForContent('enotif_impersonal_salutation'), |
| 595 | | - $wgLang->timeanddate($this->timestamp, true, false, false)), |
| | 595 | + $wgContLang->timeanddate($this->timestamp, true, false, false)), |
| 596 | 596 | $this->body); |
| 597 | 597 | |
| 598 | 598 | return UserMailer::send($addresses, $this->from, $this->subject, $body, $this->replyto); |