From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 13 Dec 2007 23:47:52 +0000 (+0000)
Subject: Put timestamp in revert url
X-Git-Tag: 1.31.0-rc.0~50432
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=8330c2cb1bdadbebdad0226ea2d352a00dc2a713;p=lhc%2Fweb%2Fwiklou.git

Put timestamp in revert url
---

diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php
index 98bcf7cf87..aa3f66b195 100644
--- a/includes/SpecialLog.php
+++ b/includes/SpecialLog.php
@@ -409,7 +409,10 @@ class LogViewer {
 			} elseif ( $s->log_action == 'merge' ) {
 				$merge = SpecialPage::getTitleFor( 'Mergehistory' );
 				$revert = '(' .  $this->skin->makeKnownLinkObj( $merge, wfMsg('revertmerge'),
-					wfArrayToCGI( array('target' => $paramArray[0], 'dest' => $title->getPrefixedText() ) ) ) . ')';
+					wfArrayToCGI( 
+						array('target' => $paramArray[0], 'dest' => $title->getPrefixedText(), 'mergepoint' => $paramArray[1] ) 
+					) 
+				) . ')';
 			} elseif ( wfRunHooks( 'LogLine', array( $s->log_type, $s->log_action, $title, $paramArray, &$comment, &$revert ) ) ) {
 				// wfDebug( "Invoked LogLine hook for " $s->log_type . ", " . $s->log_action . "\n" );
 				// Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters.