Followup r90239: Move return till after the toggle is executed.

[lhc/web/wiklou.git] / index.php

diff --git a/index.php b/index.php
index 9caed7a..fb415bc 100644 (file)
--- a/index.php
+++ b/index.php
@@ -64,99 +64,14 @@ ENDL;
 # Initialise common code.  This gives us access to GlobalFunctions, the AutoLoader, and
 # the globals $wgRequest, $wgOut, $wgUser, $wgLang and $wgContLang, amongst others; it
 # does *not* load $wgTitle
-require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
-
-try {
-       wfIndexMain();
-} catch ( Exception $e ) {
-       wfExceptionHandler( $e );
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+       require ( 'phase3/includes/WebStart.php' );
+} else {
+       require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
 }
 
-function wfIndexMain() {
-       global $wgRequest, $wgShowHostnames, $mediaWiki, $wgTitle, $wgUseAjax, $wgUseFileCache;
-
-       wfProfileIn( 'index.php' );
-       wfProfileIn( 'index.php-setup' );
-
-       $maxLag = $wgRequest->getVal( 'maxlag' );
-       if ( !is_null( $maxLag ) ) {
-               $lb = wfGetLB(); // foo()->bar() is not supported in PHP4
-               list( $host, $lag ) = $lb->getMaxLag();
-               if ( $lag > $maxLag ) {
-                       header( 'HTTP/1.1 503 Service Unavailable' );
-                       header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
-                       header( 'X-Database-Lag: ' . intval( $lag ) );
-                       header( 'Content-Type: text/plain' );
-                       if( $wgShowHostnames ) {
-                               echo "Waiting for $host: $lag seconds lagged\n";
-                       } else {
-                               echo "Waiting for a database server: $lag seconds lagged\n";
-                       }
-                       return;
-               }
-       }
-
-       # Initialize MediaWiki base class
-       $context = RequestContext::getMain();
-       $mediaWiki = new MediaWiki( $context );
-
-       # Set title from request parameters
-       $wgTitle = $mediaWiki->getTitle();
-       $action = $wgRequest->getVal( 'action', 'view' );
-
-       wfProfileOut( 'index.php-setup' );
-
-       # Send Ajax requests to the Ajax dispatcher.
-       if ( $wgUseAjax && $action == 'ajax' ) {
-               $dispatcher = new AjaxDispatcher();
-               $dispatcher->performAction();
-               wfProfileOut( 'index.php' );
-               $mediaWiki->restInPeace();
-               return;
-       }
-
-       if ( $wgUseFileCache && $wgTitle !== null ) {
-               wfProfileIn( 'index.php-filecache' );
-               // Raw pages should handle cache control on their own,
-               // even when using file cache. This reduces hits from clients.
-               if ( $action != 'raw' && HTMLFileCache::useFileCache() ) {
-                       /* Try low-level file cache hit */
-                       $cache = new HTMLFileCache( $wgTitle, $action );
-                       if ( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
-                               /* Check incoming headers to see if client has this cached */
-                               if ( !$context->output->checkLastModified( $cache->fileCacheTime() ) ) {
-                                       $cache->loadFromFileCache();
-                               }
-                               # Do any stats increment/watchlist stuff
-                               $article = Article::newFromTitle( $wgTitle, $context );
-                               $article->viewUpdates();
-                               # Tell OutputPage that output is taken care of
-                               $context->output->disable();
-                               wfProfileOut( 'index.php-filecache' );
-                               $mediaWiki->finalCleanup();
-                               wfProfileOut( 'index.php' );
-                               $mediaWiki->restInPeace();
-                               return;
-                       }
-               }
-               wfProfileOut( 'index.php-filecache' );
-       }
-
-       /**
-        * $wgArticle is deprecated, do not use it. This will possibly be removed
-        * entirely in 1.20 or 1.21
-        * @deprecated since 1.19
-        */
-       global $wgArticle;
-
-       $wgArticle = $mediaWiki->performRequest();
-
-       $mediaWiki->finalCleanup();
-
-       wfProfileOut( 'index.php' );
-
-       $mediaWiki->restInPeace();
-}
+$mediaWiki = new MediaWiki();
+$mediaWiki->run();
 
 /**
  * Display something vaguely comprehensible in the event of a totally unrecoverable error.
@@ -174,9 +89,15 @@ function wfDie( $errorMsg ){
        $version = isset( $wgVersion ) && $wgVersion
                ? htmlspecialchars( $wgVersion )
                : '';
+
+       $script = $_SERVER['SCRIPT_NAME'];
+       $path = pathinfo( $script, PATHINFO_DIRNAME ) . '/';
+       $path = str_replace( '//', '/', $path );
+
        $logo = isset( $wgLogo ) && $wgLogo
                ? $wgLogo
-               : 'http://upload.wikimedia.org/wikipedia/commons/1/1c/MediaWiki_logo.png';
+               : $path . 'skins/common/images/mediawiki.png';
+       $encLogo = htmlspecialchars( $logo );
 
        header( $_SERVER['SERVER_PROTOCOL'] . ' 500 MediaWiki configuration Error', true, 500 );
        header( 'Content-type: text/html; charset=UTF-8' );
@@ -208,7 +129,7 @@ function wfDie( $errorMsg ){
                </style>
        </head>
        <body>
-               <img src="<?php echo $logo; ?>" alt='The MediaWiki logo' />
+               <img src="<?php echo $encLogo; ?>" alt='The MediaWiki logo' />
                <h1>MediaWiki <?php echo $version; ?> internal error</h1>
                <div class='error'> <?php echo $errorMsg; ?> </div>
        </body>