From f47d1eee0e17769f40360e4052a254db99fc35d5 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 21 Jul 2016 20:55:04 +0100 Subject: [PATCH] OutputPage: Fix blank line between and Follows-up a464d1d41 which changed OutputPage::headElement() to join pieces by a line break instead of hardcoding line breaks after (some) generated pieces. This caused a minor regression in the form of a blank line between and on every page, because I missed the one that came from this class. Change-Id: I5e48b852809699b205f4581c833605f3e232610a --- includes/Html.php | 8 +------- includes/installer/WebInstallerOutput.php | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/includes/Html.php b/includes/Html.php index a5567fc043..7cb75bba91 100644 --- a/includes/Html.php +++ b/includes/Html.php @@ -935,13 +935,7 @@ class Html { $attribs['version'] = $wgHtml5Version; } - $html = self::openElement( 'html', $attribs ); - - if ( $html ) { - $html .= "\n"; - } - - $ret .= $html; + $ret .= self::openElement( 'html', $attribs ); return $ret; } diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php index f8dc8ee57f..62fe7852b7 100644 --- a/includes/installer/WebInstallerOutput.php +++ b/includes/installer/WebInstallerOutput.php @@ -267,6 +267,7 @@ class WebInstallerOutput { } ?> getHeadAttribs() ); ?> + -- 2.20.1