From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 15 Jan 2008 15:38:30 +0000 (+0000)
Subject: (bug 12585) Added a bunch of parameters to the revertpage message (rollback summary... 
X-Git-Tag: 1.31.0-rc.0~49987
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=a4aa4e77e659f1f970cadd19e0f2eb63a6489662;p=lhc%2Fweb%2Fwiklou.git

(bug 12585) Added a bunch of parameters to the revertpage message (rollback summary). These parameters currently aren't used in the default message, but custom messages could use them.

$3: revid of the revision reverted to
$4: timestamp of the revision reverted to
$5: revid of the revision reverted from
$6: timestamp of the revision reverted from
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fcf0106df2..3bf25b7ebd 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -130,6 +130,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12622) A JavaScript constant to declare whether api.php is available
 * Add caching to the AJAX search
 * Added APCOND_INGROUPS
+* (bug 18585) Added a bunch of parameters to the revertpage message
 
 
 === Bug fixes in 1.12 ===
diff --git a/includes/Article.php b/includes/Article.php
index 3193d404b5..9ca021cca5 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2367,7 +2367,14 @@ class Article {
 		# Get the edit summary
 		$target = Revision::newFromId( $s->rev_id );
 		if( empty( $summary ) )
-			$summary = wfMsgForContent( 'revertpage', $target->getUserText(), $from );
+		{
+			global $wgLang;
+			$summary = wfMsgForContent( 'revertpage',
+					 $target->getUserText(), $from,
+					 $s->rev_id, $wgLang->timeanddate(wfTimestamp(TS_MW, $s->rev_timestamp), true),
+					 $current->getId(), $wgLang->timeanddate($current->getTimestamp())
+			);
+		}
 
 		# Save
 		$flags = EDIT_UPDATE;