Merge "Drop index oi_name_archive_name on table oldimage"

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

index b4c8aa8..e4eb255 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -115,7 +115,10 @@ class WebInstallerOutput {
  
         public function output() {
                 $this->flush();
-               $this->outputFooter();
+
+               if ( !$this->redirectTarget ) {
+                       $this->outputFooter();
+               }
         }
  
         /**
@@ -264,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" />
@@ -295,9 +299,9 @@ 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 style="background-image: url(images/installer-logo.png);"
+                       href="https://www.mediawiki.org/"
+                       title="Main Page"></a>
         </div>
  <?php
         $message = wfMessage( 'config-sidebar' )->plain();