Merge "Remove incorrect span in translation"

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

index 77e9a2c..1df8f05 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -185,6 +185,7 @@ class WebInstallerOutput {
          */
         public function getDir() {
                 global $wgLang;
+
                 return is_object( $wgLang ) ? $wgLang->getDir() : 'ltr';
         }
  
@@ -193,6 +194,7 @@ class WebInstallerOutput {
          */
         public function getLanguageCode() {
                 global $wgLang;
+
                 return is_object( $wgLang ) ? $wgLang->getCode() : 'en';
         }
  
@@ -216,22 +218,23 @@ class WebInstallerOutput {
  
         public function outputHeader() {
                 $this->headerDone = true;
-               $dbTypes = $this->parent->getDBTypes();
-
                 $this->parent->request->response()->header( 'Content-Type: text/html; charset=utf-8' );
+
                 if ( !$this->allowFrames ) {
                         $this->parent->request->response()->header( 'X-Frame-Options: DENY' );
                 }
+
                 if ( $this->redirectTarget ) {
                         $this->parent->request->response()->header( 'Location: ' . $this->redirectTarget );
+
                         return;
                 }
  
                 if ( $this->useShortHeader ) {
                         $this->outputShortHeader();
+
                         return;
                 }
-
  ?>
  <?php echo Html::htmlHeader( $this->getHeadAttribs() ); ?>
  <head>