From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 26 Jun 2013 22:13:06 +0000 (+0000)
Subject: Merge "DifferenceEngine: Don't display empty header row"
X-Git-Tag: 1.31.0-rc.0~19338
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=7844c9a0581ec68ab7213f81d228c279ed167542;hp=a68459e8e9271e7daea914bdde093fcce9ead67e;p=lhc%2Fweb%2Fwiklou.git

Merge "DifferenceEngine: Don't display empty header row"
---

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 916ab38c13..975d490123 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -994,11 +994,13 @@ class DifferenceEngine extends ContextSource {
 				$colspan = 1;
 				$multiColspan = 2;
 			}
-			$header .= "
-			<tr style='vertical-align: top;'>
-			<td colspan='$colspan' class='diff-otitle'>{$otitle}</td>
-			<td colspan='$colspan' class='diff-ntitle'>{$ntitle}</td>
-			</tr>";
+			if ( $otitle || $ntitle ) {
+				$header .= "
+				<tr style='vertical-align: top;'>
+				<td colspan='$colspan' class='diff-otitle'>{$otitle}</td>
+				<td colspan='$colspan' class='diff-ntitle'>{$ntitle}</td>
+				</tr>";
+			}
 		}
 
 		if ( $multi != '' ) {