Adjust datetime in email confirmation email

Use the correct timezone when setting the expiry timestamp in the email
confirmation.
Using Language::userDateAndTime to avoid indirect use of $wgUser, so it
is always the timezone used of the user the message gets send for.

Bug: T29158
Change-Id: Ieb74b72a4255d9d652f828d1879882dff4b45379

diff --git a/includes/user/User.php b/includes/user/User.php
index 3d1aa7e..1de4008 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4279,10 +4279,10 @@ class User implements IDBAccessObject {
                                $this->getRequest()->getIP(),
                                $this->getName(),
                                $url,
-                               $wgLang->timeanddate( $expiration, false ),
+                               $wgLang->userTimeAndDate( $expiration, $this ),
                                $invalidateURL,
-                               $wgLang->date( $expiration, false ),
-                               $wgLang->time( $expiration, false ) )->text() );
+                               $wgLang->userDate( $expiration, $this ),
+                               $wgLang->userTime( $expiration, $this ) )->text() );
        }
 
        /**