From 346ebdb96d0a1918b566ed3c0955164da50a0d83 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Mon, 20 Aug 2007 14:32:08 +0000
Subject: [PATCH] * Fix FileRevertForm::getTimestamp() - stupid assumption
 about archive names :) * Do date/time adjustments where applicable * Reverse
 odd ordering of date/times in messages - time, then date looks cleaner in
 English * Remove the commented-out remnants for now

---
 includes/FileRevertForm.php       | 37 ++++++++-----------------------
 languages/messages/MessagesEn.php |  6 ++---
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/includes/FileRevertForm.php b/includes/FileRevertForm.php
index d72654b05a..6945a1879e 100644
--- a/includes/FileRevertForm.php
+++ b/includes/FileRevertForm.php
@@ -68,8 +68,8 @@ class FileRevertForm {
 			$status = $this->file->upload( $source, $comment, $comment );
 			if( $status->isGood() ) {
 				$wgOut->addHtml( wfMsgExt( 'filerevert-success', 'parse', $this->title->getText(),
-					$wgLang->date( $this->getTimestamp() ),
-					$wgLang->time( $this->getTimestamp() ),
+					$wgLang->date( $this->getTimestamp(), true ),
+					$wgLang->time( $this->getTimestamp(), true ),
 					$wgServer . $this->file->getArchiveUrl( $this->oldimage ) ) );
 				$wgOut->returnToMain( false, $this->title );
 			} else {
@@ -87,37 +87,13 @@ class FileRevertForm {
 	 */
 	private function showForm() {
 		global $wgOut, $wgUser, $wgRequest, $wgLang, $wgContLang, $wgServer;
-		
-		/*
-		$cur = wfFindFile( $this->title );
-		$old = wfFindFile( $this->title, substr( $this->oldimage, 0, 14 ) );
-		 */
 		$timestamp = $this->getTimestamp();
 
 		$form  = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) );
 		$form .= Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) );
 		$form .= '<fieldset><legend>' . wfMsgHtml( 'filerevert-legend' ) . '</legend>';
 		$form .= wfMsgExt( 'filerevert-intro', 'parse', $this->title->getText(),
-			$wgLang->date( $timestamp ), $wgLang->time( $timestamp ), $wgServer . $this->file->getArchiveUrl( $this->oldimage ) );
-		
-		/*
-		 * I was going to do a little comparison (current vs. old) here,
-		 * but realised it wasn't too straightforward to do a media transform
-		 * with an *old* file version using the current mechanism. Leaving
-		 * this here in case it becomes possible in the future. -- RC
-		 *
-		$form .= '<table class="compare-files">';
-		$form .= '<tr>';
-		$form .= '<th>' . wfMsgHtml( 'filerevert-current' ) . '</th>';
-		$form .= '<th>' . wfMsgHtml( 'filerevert-old', $old->getTimestamp() ) . '</th>';
-		$form .= '</tr><tr>';
-		// FIXME: Hard-coding magic numbers makes baby Jesus cry...
-		$form .= '<td>' . $this->getThumbnail( $cur, 180 ) . '</td>';
-		$form .= '<td>' . $this->getThumbnail( $old, 180 ) . '</td>';
-		$form .= '</tr>';		
-		$form .= '</table>';
-		 */
-		
+			$wgLang->date( $timestamp, true ), $wgLang->time( $timestamp, true ), $wgServer . $this->file->getArchiveUrl( $this->oldimage ) );
 		$form .= '<p>' . Xml::inputLabel( wfMsg( 'filerevert-comment' ), 'wpComment', 'wpComment',
 			60, wfMsgForContent( 'filerevert-defaultcomment',
 			$wgContLang->date( $timestamp, false, false ), $wgContLang->time( $timestamp, false, false ) ) ) . '</p>';
@@ -177,7 +153,12 @@ class FileRevertForm {
 	 * @return string
 	 */
 	private function getTimestamp() {
-		return substr( $this->oldimage, 0, 14 );
+		static $timestamp = false;
+		if( $timestamp === false ) {
+			$file = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
+			$timestamp = $file->getTimestamp();
+		}
+		return $timestamp;
 	}
 	
 }
\ No newline at end of file
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7abfe69d53..af420e62e0 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1495,11 +1495,11 @@ If you have this image in full resolution upload this one, otherwise change the
 # File reversion
 'filerevert'                => 'Revert $1',
 'filerevert-legend'         => 'Revert file',
-'filerevert-intro'          => "<span class=\"plainlinks\">You are reverting '''[[Media:$1|$1]]''' to the [$4 version as of $2, $3].</span>",
+'filerevert-intro'          => "<span class=\"plainlinks\">You are reverting '''[[Media:$1|$1]]''' to the [$4 version as of $3, $2].</span>",
 'filerevert-comment'        => 'Comment:',
-'filerevert-defaultcomment' => 'Reverted to version as of $1, $2',
+'filerevert-defaultcomment' => 'Reverted to version as of $2, $1',
 'filerevert-submit'         => 'Revert',
-'filerevert-success'        => "<span class=\"plainlinks\">'''[[Media:$1|$1]]''' has been reverted to the [$4 version as of $2, $3].</span>",
+'filerevert-success'        => "<span class=\"plainlinks\">'''[[Media:$1|$1]]''' has been reverted to the [$4 version as of $3, $2].</span>",
 'filerevert-badversion'     => 'There is no previous local version of this file with the provided timestamp.',
 
 # File deletion
-- 
2.20.1