From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 22 Oct 2009 15:11:52 +0000 (+0000)
Subject: * (bug 21053) Fixed diff header layout for multi diffs with no changes
X-Git-Tag: 1.31.0-rc.0~39183
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=e14987e85d74756f2dcfe7e5da67e4029d1c0a76;p=lhc%2Fweb%2Fwiklou.git

* (bug 21053) Fixed diff header layout for multi diffs with no changes
---

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index b8478651b5..82b62086a3 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -928,8 +928,10 @@ CONTROL;
 		<td colspan='$colspan' class='diff-ntitle'>{$ntitle}</td>
 		</tr>";
 
-		if ( $multi != '' )
-		$header .= "<tr><td colspan='4' align='center' class='diff-multi'>{$multi}</td></tr>";
+		if ( $multi != '' ) {
+			$multiColspan = $diff ? 4 : 2;
+			$header .= "<tr><td colspan='{$multiColspan}' align='center' class='diff-multi'>{$multi}</td></tr>";
+		}
 
 		return $header . $diff . "</table>";
 	}