From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 1 Aug 2011 23:28:16 +0000 (+0000)
Subject: Add Profiling to trunk from r93681
X-Git-Tag: 1.31.0-rc.0~28506
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=40aa62e9dc41f9a6cb3a7416810ceeb0bb1d9a3c;p=lhc%2Fweb%2Fwiklou.git

Add Profiling to trunk from r93681
---

diff --git a/includes/Article.php b/includes/Article.php
index 9bf3f05838..db7faac435 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1860,6 +1860,7 @@ class Article extends Page {
 		global $wgEnableParserCache, $wgUser;
 		$user = is_null( $user ) ? $wgUser : $user;
 
+		wfProfileIn( __METHOD__ );
 		// Should the parser cache be used?
 		$useParserCache = $wgEnableParserCache &&
 			$user->getStubThreshold() == 0 &&
@@ -1875,6 +1876,7 @@ class Article extends Page {
 		if ( $useParserCache ) {
 			$parserOutput = ParserCache::singleton()->get( $this, $this->mPage->getParserOptions() );
 			if ( $parserOutput !== false ) {
+				wfProfileOut( __METHOD__ );
 				return $parserOutput;
 			}
 		}
@@ -1890,6 +1892,7 @@ class Article extends Page {
 			$text = $rev->getText();
 		}
 
+		wfProfileOut( __METHOD__ );
 		return $this->getOutputFromWikitext( $text, $useParserCache );
 	}