From 63bfaf251a55ed2f66a0cfb068acc62d6d7b6228 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Tue, 28 Jun 2011 04:47:59 +0000 Subject: [PATCH] Use content language in formatting of dates in revertpage message (rollback revert edit summary) and do not adjust for user timezone. --- RELEASE-NOTES-1.19 | 2 ++ includes/Article.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 206bf8674a..21e7fabca2 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -127,6 +127,8 @@ production. "vectorTabs" portlets. * (bug 8556) Incorrect session failure warning on preview-on-open namespaces (categories) when combined with $wgRawHtml. +* Use content language in formatting of dates in revertpage message + (rollback revert edit summary) and do not adjust for user timezone. === API changes in 1.19 === * BREAKING CHANGE: action=watch now requires POST and token. diff --git a/includes/Article.php b/includes/Article.php index eed8aa1f54..76b70f4471 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -3237,7 +3237,7 @@ class Article { * doRollback() instead. */ public function commitRollback( $fromP, $summary, $bot, &$resultDetails ) { - global $wgUseRCPatrol, $wgUser, $wgLang; + global $wgUseRCPatrol, $wgUser, $wgContLang; $dbw = wfGetDB( DB_MASTER ); @@ -3318,8 +3318,8 @@ class Article { # Allow the custom summary to use the same args as the default message $args = array( $target->getUserText(), $from, $s->rev_id, - $wgLang->timeanddate( wfTimestamp( TS_MW, $s->rev_timestamp ), true ), - $current->getId(), $wgLang->timeanddate( $current->getTimestamp() ) + $wgContLang->timeanddate( wfTimestamp( TS_MW, $s->rev_timestamp ) ), + $current->getId(), $wgContLang->timeanddate( $current->getTimestamp() ) ); $summary = wfMsgReplaceArgs( $summary, $args ); -- 2.20.1