From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 10 Dec 2008 04:40:18 +0000 (+0000)
Subject: Remove noisy profiling
X-Git-Tag: 1.31.0-rc.0~44075
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=db9f5258e6059a5e7f9bf80a35b5d5a5de40b713;p=lhc%2Fweb%2Fwiklou.git

Remove noisy profiling
---

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 343e829301..3b8c6410c5 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -50,7 +50,6 @@ class MediaWiki {
 	 * @param $request WebRequest
 	 */
 	function initialize( &$title, &$article, &$output, &$user, $request ) {
-		wfProfileIn( __METHOD__ );
 		$this->preliminaryChecks( $title, $output, $request ) ;
 		if( !$this->initializeSpecialCases( $title, $output, $request ) ) {
 			$new_article = $this->initializeArticle( $title, $request );
@@ -60,11 +59,9 @@ class MediaWiki {
 			} elseif( is_string( $new_article ) ) {
 				$output->redirect( $new_article );
 			} else {
-				wfProfileOut( __METHOD__ );
 				throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" );
 			}
 		}
-		wfProfileOut( __METHOD__ );
 	}
 
 	/**
@@ -132,7 +129,6 @@ class MediaWiki {
 	 * @param $request WebRequest
 	 */
 	function preliminaryChecks( &$title, &$output, $request ) {
-
 		if( $request->getCheck( 'search' ) ) {
 			// Compatibility with old search URLs which didn't use Special:Search
 			// Just check for presence here, so blank requests still
@@ -141,7 +137,6 @@ class MediaWiki {
 			// Do this above the read whitelist check for security...
 			$title = SpecialPage::getTitleFor( '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())
@@ -150,7 +145,6 @@ class MediaWiki {
 			$output->output();
 			exit;
 		}
-
 	}
 
 	/**
@@ -418,10 +412,7 @@ class MediaWiki {
 	 * @param $request WebRequest
 	 */
 	function performAction( &$output, &$article, &$title, &$user, &$request ) {
-		wfProfileIn( __METHOD__ );
-
 		if( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) {
-			wfProfileOut( __METHOD__ );
 			return;
 		}
 
@@ -512,7 +503,6 @@ class MediaWiki {
 					$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
 				}
 		}
-		wfProfileOut( __METHOD__ );
 
 	}