Fix for r79874: only set $mRevIdFetched from fetchContent(), it was overriden by...

[lhc/web/wiklou.git] / includes / installer / WebInstallerOutput.php

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 3492ca8..4f68b4f 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -9,20 +9,20 @@
 /**
  * Output class modelled on OutputPage.
  *
- * I've opted to use a distinct class rather than derive from OutputPage here in 
- * the interests of separation of concerns: if we used a subclass, there would be 
- * quite a lot of things you could do in OutputPage that would break the installer, 
- * that wouldn't be immediately obvious. 
- * 
+ * I've opted to use a distinct class rather than derive from OutputPage here in
+ * the interests of separation of concerns: if we used a subclass, there would be
+ * quite a lot of things you could do in OutputPage that would break the installer,
+ * that wouldn't be immediately obvious.
+ *
  * @ingroup Deployment
  * @since 1.17
  */
 class WebInstallerOutput {
        /**
         * The WebInstaller object this WebInstallerOutput is used by.
-        * 
+        *
         * @var WebInstaller
-        */     
+        */
        public $parent;
 
        /**
@@ -47,7 +47,7 @@ class WebInstallerOutput {
 
        /**
         * Constructor.
-        * 
+        *
         * @param $parent WebInstaller
         */
        public function __construct( WebInstaller $parent ) {
@@ -88,6 +88,7 @@ class WebInstallerOutput {
                $skinDir = dirname( dirname( dirname( __FILE__ ) ) ) . '/skins';
                $vectorCssFile = "$skinDir/vector/screen.css";
                $configCssFile = "$skinDir/common/config.css";
+               $css = '';
                wfSuppressWarnings();
                $vectorCss = file_get_contents( $vectorCssFile );
                $configCss = file_get_contents( $configCssFile );
@@ -161,7 +162,8 @@ class WebInstallerOutput {
                $this->headerDone = true;
                $dbTypes = $this->parent->getDBTypes();
 
-               $this->parent->request->response()->header("Content-Type: text/html; charset=utf-8");
+               $this->parent->request->response()->header( 'Content-Type: text/html; charset=utf-8' );
+               $this->parent->request->response()->header( 'X-Frame-Options: DENY' );
                if ( $this->redirectTarget ) {
                        $this->parent->request->response()->header( 'Location: '.$this->redirectTarget );
                        return;
@@ -186,12 +188,6 @@ class WebInstallerOutput {
 </head>
 
 <?php echo Html::openElement( 'body', array( 'class' => $this->getDir() ) ) . "\n"; ?>
-<noscript>
-<style type="text/css">
-.config-help-message { display: block; }
-.config-show-help { display: none; }
-</style>
-</noscript>
 <div id="mw-page-base"></div>
 <div id="mw-head-base"></div>
 <div id="content">
@@ -216,8 +212,8 @@ class WebInstallerOutput {
 <div id="mw-panel">
        <div class="portal" id="p-logo">
          <a style="background-image: url(../skins/common/images/mediawiki.png);"
-           href="http://www.mediawiki.org/"
-           title="Main Page"></a>
+               href="http://www.mediawiki.org/"
+               title="Main Page"></a>
        </div>
        <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
        <div class="portal"><div class="body">
@@ -256,10 +252,4 @@ class WebInstallerOutput {
        public function getJQuery() {
                return Html::linkedScript( "../resources/jquery/jquery.js" );
        }
-
-       public function outputWarnings() {
-               $this->addHTML( $this->warnings );
-               $this->warnings = '';
-       }
-       
 }