close profiling on script exits instead of page flushing

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

diff --git a/index.php b/index.php
index da837c9..3436e57 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,8 +3,8 @@
  * Main wiki script; see docs/design.txt
  * @package MediaWiki
  */
-
 $wgRequestTime = microtime();
+$wgRUstart = getrusage();
 
 unset( $IP );
 @ini_set( 'allow_url_fopen', 0 ); # For security...
@@ -95,6 +95,13 @@ wfProfileOut( 'main-misc-setup' );
 # Debug statement for user levels
 // print_r($wgUser);
 
+$search = $wgRequest->getText( 'search' );
+if( !is_null( $search ) && $search !== '' ) {
+       // Compatibility with old search URLs which didn't use Special:Search
+       // Do this above the read whitelist check for security...
+       $wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
+}
+
 # If the user is not logged in, the Namespace:title of the article must be in
 # the Read array in order for the user to see it. (We have to check here to
 # catch special pages etc. We check again in Article::view())
@@ -105,10 +112,6 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( 'main-action' );
-$search = $wgRequest->getText( 'search' );
-if( $wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
-       $wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
-}
 
 if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
        require_once( 'includes/SpecialSearch.php' );
@@ -163,7 +166,7 @@ if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
                unset($wgArticle);
                require_once( 'includes/ImagePage.php' );
                $wgArticle = new ImagePage( $wgTitle );
-       } elseif ( $wgUseCategoryMagic && $ns == NS_CATEGORY ) {
+       } elseif ( $ns == NS_CATEGORY ) {
                unset($wgArticle);
                require_once( 'includes/CategoryPage.php' );
                $wgArticle = new CategoryPage( $wgTitle );
@@ -283,6 +286,7 @@ foreach ( $wgPostCommitUpdateList as $up ) {
 
 wfProfileOut( 'main-cleanup' );
 
+wfProfileClose();
 logProfilingData();
 $wgLoadBalancer->closeAll();
 wfDebug( "Request ended normally\n" );