From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Mon, 19 Sep 2005 12:54:18 +0000 (+0000)
Subject: * Showing width/height in image histories
X-Git-Tag: 1.6.0~1609
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=54c96537f201c84bf91097c526d3f3b4fe998c1a;p=lhc%2Fweb%2Fwiklou.git

* Showing width/height in image histories
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index cda3c9677e..f596da4377 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -324,12 +324,16 @@ END
 			$s = $list->beginImageHistoryList() .
 				$list->imageHistoryLine( true, wfTimestamp(TS_MW, $line->img_timestamp),
 					$this->mTitle->getDBkey(),  $line->img_user,
-					$line->img_user_text, $line->img_size, $line->img_description );
+					$line->img_user_text, $line->img_size, $line->img_description,
+					$line->img_width, $line->img_height
+				);
 
 			while ( $line = $this->img->nextHistoryLine() ) {
 				$s .= $list->imageHistoryLine( false, $line->img_timestamp,
-			  	$line->oi_archive_name, $line->img_user,
-			  	$line->img_user_text, $line->img_size, $line->img_description );
+			  		$line->oi_archive_name, $line->img_user,
+			  		$line->img_user_text, $line->img_size, $line->img_description,
+					$line->img_width, $line->img_height
+				);
 			}
 			$s .= $list->endImageHistoryList();
 		} else { $s=''; }
@@ -642,7 +646,7 @@ class ImageHistoryList {
 		return $s;
 	}
 
-	function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description ) {
+	function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description, $width, $height ) {
 		global $wgUser, $wgLang, $wgContLang, $wgTitle;
 
 		$datetime = $wgLang->timeanddate( $timestamp, true );
@@ -688,10 +692,10 @@ class ImageHistoryList {
 				$usertext );
 		}
 		$nbytes = wfMsg( 'nbytes', $size );
+		$widthheight = wfMsg( 'widthheight', $width, $height );
 		$style = $this->skin->getInternalLinkAttributes( $url, $datetime );
 
-		$s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a>"
-		  . " . . {$userlink} ({$nbytes})";
+		$s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a> . . {$userlink} . . {$widthheight} ({$nbytes})";
 
 		$s .= $this->skin->commentBlock( $description, $wgTitle );
 		$s .= "</li>\n";