From: Brian Wolff <bawolff@users.mediawiki.org>
Date: Tue, 28 Jun 2011 04:47:59 +0000 (+0000)
Subject: Use content language in formatting of dates in revertpage message
X-Git-Tag: 1.31.0-rc.0~29230
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=63bfaf251a55ed2f66a0cfb068acc62d6d7b6228;p=lhc%2Fweb%2Fwiklou.git

Use content language in formatting of dates in revertpage message
(rollback revert edit summary) and do not adjust for user timezone.
---

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 );