From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 29 Apr 2008 16:35:11 +0000 (+0000)
Subject: tweaks:
X-Git-Tag: 1.31.0-rc.0~48004
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=c44fc31ac7a7ab597b23475833c213b6f9821336;p=lhc%2Fweb%2Fwiklou.git

tweaks:
* group master queries with other queries in "SQL Queries" in profileinfo.php
* end 'main-misc-setup' section before executing ajax requests so that they don't get closed by the profiler for ajax requests.
---

diff --git a/index.php b/index.php
index d5a42a3e0f..4bbf98fefd 100644
--- a/index.php
+++ b/index.php
@@ -61,6 +61,8 @@ if ($wgTitle == NULL) {
 	unset( $wgTitle );
 }
 
+wfProfileOut( 'main-misc-setup' );
+
 #
 # Send Ajax requests to the Ajax dispatcher.
 #
@@ -73,8 +75,6 @@ if ( $wgUseAjax && $action == 'ajax' ) {
 	exit;
 }
 
-wfProfileOut( 'main-misc-setup' );
-
 # Setting global variables in mediaWiki
 $mediaWiki->setVal( 'action', $action );
 $mediaWiki->setVal( 'CommandLineMode', $wgCommandLineMode );
diff --git a/profileinfo.php b/profileinfo.php
index ab28785e66..5ea37c09e4 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -283,7 +283,7 @@ while (($o = mysql_fetch_object($res)) !== false) {
 		}
 	}
 	$last = $next;
-	if (preg_match("/^query: /", $next->name())) {
+	if (preg_match("/^query: /", $next->name()) || preg_match("/^query-m: /", $next->name())) {
 		$sqltotal += $next->time();
 		$queries[] = $next;
 	} else {