* (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 b847865..82b6208 100644 (file)
--- 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>";
        }