Installer: Make short header and normal header of WebInstaller equivalent

[lhc/web/wiklou.git] / includes / installer / WebInstallerOutput.php
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php

index ae07d0c..914a69e 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -21,6 +21,8 @@
   * @ingroup Deployment
   */
  
+use MediaWiki\MediaWikiServices;
+
  /**
   * Output class modelled on OutputPage.
   *
@@ -147,7 +149,7 @@ class WebInstallerOutput {
                         'mediawiki.skinning.interface',
                 ];
  
-               $resourceLoader = new ResourceLoader();
+               $resourceLoader = MediaWikiServices::getInstance()->getResourceLoader();
  
                 if ( file_exists( "$wgStyleDirectory/Vector/skin.json" ) ) {
                         // Force loading Vector skin if available as a fallback skin
@@ -302,9 +304,7 @@ class WebInstallerOutput {
  
  <div id="mw-panel">
         <div class="portal" id="p-logo">
-               <a style="background-image: url(images/installer-logo.png);"
-                       href="https://www.mediawiki.org/"
-                       title="Main Page"></a>
+               <a href="https://www.mediawiki.org/" title="Main Page"></a>
         </div>
  <?php
         $message = wfMessage( 'config-sidebar' )->plain();
@@ -323,13 +323,14 @@ class WebInstallerOutput {
         public function outputShortHeader() {
  ?>
  <?php echo Html::htmlHeader( $this->getHeadAttribs() ); ?>
+
  <head>
-       <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <meta name="robots" content="noindex, nofollow" />
+       <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title><?php $this->outputTitle(); ?></title>
         <?php echo $this->getCssUrl() . "\n"; ?>
-       <?php echo $this->getJQuery(); ?>
-       <?php echo Html::linkedScript( 'config.js' ); ?>
+       <?php echo $this->getJQuery() . "\n"; ?>
+       <?php echo Html::linkedScript( 'config.js' ) . "\n"; ?>
  </head>
  
  <body style="background-image: none">