From e14987e85d74756f2dcfe7e5da67e4029d1c0a76 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 22 Oct 2009 15:11:52 +0000
Subject: [PATCH] * (bug 21053) Fixed diff header layout for multi diffs with
 no changes

---
 includes/diff/DifferenceInterface.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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>";
 	}
-- 
2.20.1