dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 29d3feb)
OutputPage: Fix blank line between <html> and <head>
authorTimo Tijhof <krinklemail@gmail.com>
Thu, 21 Jul 2016 19:55:04 +0000 (20:55 +0100)
committerTimo Tijhof <krinklemail@gmail.com>
Thu, 21 Jul 2016 20:08:24 +0000 (21:08 +0100)
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
<html> and <head> on every page, because I missed the one that
came from this class.

Change-Id: I5e48b852809699b205f4581c833605f3e232610a

includes/Html.php patch | blob | history
includes/installer/WebInstallerOutput.php patch | blob | history

diff --git a/includes/Html.php b/includes/Html.php
index a5567fc..7cb75bb 100644 (file)
--- 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 f8dc8ee..62fe785 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -267,6 +267,7 @@ class WebInstallerOutput {
                }
 ?>
 <?php echo Html::htmlHeader( $this->getHeadAttribs() ); ?>
+
 <head>
        <meta name="robots" content="noindex, nofollow" />
        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
Wiklou, le Wiki du Wiklou