Reverted r113177 per CR

[lhc/web/wiklou.git] / includes / WebStart.php

diff --git a/includes/WebStart.php b/includes/WebStart.php
index feb8039..17f8216 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -5,29 +5,28 @@
  * configuration, and optionally loads Setup.php depending on whether
  * MW_NO_SETUP is defined.
  *
- * @file
- */
-
-/**
- * Detect compiled mode by looking for a function that only exists if compiled 
- * in. Note that we can't use function_exists(), because it is terribly broken 
- * under HipHop due to the "volatile" feature.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
- * @return bool
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
  */
-function wfDetectCompiledMode() {
-       try {
-               $r = new ReflectionFunction( 'wfHipHopCompilerVersion' );
-       } catch ( ReflectionException $e ) {
-               $r = false;
-       }
-       return $r !== false;
-}
 
 # Protect against register_globals
 # This must be done before any globals are set by the code
 if ( ini_get( 'register_globals' ) ) {
-       if ( isset( $_REQUEST['GLOBALS'] ) ) {
+       if ( isset( $_REQUEST['GLOBALS'] ) || isset( $_FILES['GLOBALS'] ) ) {
                die( '<a href="http://www.hardened-php.net/globals-problem">$GLOBALS overwrite vulnerability</a>');
        }
        $verboten = array(
@@ -88,28 +87,28 @@ if ( $IP === false ) {
        $IP = realpath( '.' );
 }
 
-if ( wfDetectCompiledMode() ) {
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
        define( 'MW_COMPILED', 1 );
-}
-
-if ( !defined( 'MW_COMPILED' ) ) {
+} else {
        # Get MWInit class
        require_once( "$IP/includes/Init.php" );
 
        # Start the autoloader, so that extensions can derive classes from core files
        require_once( "$IP/includes/AutoLoader.php" );
 
-       # Start profiler
-       # @todo FIXME: Rewrite wfProfileIn/wfProfileOut so that they can work in compiled mode
+       # Load the profiler
        require_once( "$IP/includes/profiler/Profiler.php" );
-       if ( file_exists( "$IP/StartProfiler.php" ) ) {
-               require_once( "$IP/StartProfiler.php" );
-       }
 
        # Load up some global defines.
        require_once( "$IP/includes/Defines.php" );
 }
 
+# Start the profiler
+$wgProfiler = array();
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+       require( "$IP/StartProfiler.php" );
+}
+
 wfProfileIn( 'WebStart.php-conf' );
 
 # Load default settings
@@ -127,26 +126,8 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # the wiki installer needs to be launched or the generated file uploaded to
        # the root wiki directory
        if( !file_exists( MW_CONFIG_FILE ) ) {
-               $script = $_SERVER['SCRIPT_NAME'];
-               $path = htmlspecialchars( str_replace( '//', '/', pathinfo( $script, PATHINFO_DIRNAME ) ) );
-               $ext = htmlspecialchars( pathinfo( $script, PATHINFO_EXTENSION ) );
-
-               # Check to see if the installer is running
-               if ( !function_exists( 'session_name' ) ) {
-                       $installerStarted = false;
-               } else {
-                       session_name( 'mw_installer_session' );
-                       $oldReporting = error_reporting( E_ALL & ~E_NOTICE );
-                       $success = session_start();
-                       error_reporting( $oldReporting );
-                       $installerStarted = ( $success && isset( $_SESSION['installData'] ) );
-               }
-
-               $please = $installerStarted
-                       ? "Please <a href=\"$path/mw-config/index.$ext\"> complete the installation</a> and download LocalSettings.php."
-                       : "Please <a href=\"$path/mw-config/index.$ext\"> set up the wiki</a> first.";
-
-               wfDie( "<p>LocalSettings.php not found.</p><p>$please</p>" );
+               require_once( "$IP/includes/templates/NoLocalSettings.php" );
+               die();
        }
 
        # Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)