dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 299d7fe)
Merge "OutputPage: Fix blank line between <html> and <head>"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Jul 2016 00:01:21 +0000 (00:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Jul 2016 00:01:21 +0000 (00:01 +0000)
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