From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 2 Jan 2009 19:11:34 +0000 (+0000)
Subject: (bug 5071) Image appears above text when viewing diff of an image page
X-Git-Tag: 1.31.0-rc.0~43614
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=6950c890bf9469291ec7cbf71558023a7f3cb85c;p=lhc%2Fweb%2Fwiklou.git

(bug 5071) Image appears above text when viewing diff of an image page
* Hide image/toc on diff view. Previously, img cluttered the top of the diff and you had to scroll down. Also, we have thumbnails for the history (and current) anyway.
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index aa5295e28b..314d478e11 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -93,10 +93,11 @@ class ImagePage extends Article {
 			$showmeta = false;
 		}
 
-		if( $this->displayImg->exists() )
+		if( !$diff && $this->displayImg->exists() )
 			$wgOut->addHTML( $this->showTOC($showmeta) );
 
-		$this->openShowImage();
+		if( !$diff )
+			$this->openShowImage();
 
 		# No need to display noarticletext, we use our own message, output in openShowImage()
 		if( $this->getID() ) {