From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 21 Apr 2011 15:53:25 +0000 (+0000)
Subject: Use Profiler::instance() instead of $wgProfiler
X-Git-Tag: 1.31.0-rc.0~30648
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=27fafba3e94022136fb5ada3d73b96db97aa490d;p=lhc%2Fweb%2Fwiklou.git

Use Profiler::instance() instead of $wgProfiler
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 3f106c5e0d..490621a991 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -140,12 +140,10 @@ class SkinTemplate extends Skin {
 		global $wgMaxCredits, $wgShowCreditsIfMax;
 		global $wgPageShowWatchingUsers;
 		global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments;
-		global $wgArticlePath, $wgScriptPath, $wgServer, $wgProfiler;
+		global $wgArticlePath, $wgScriptPath, $wgServer;
 
 		wfProfileIn( __METHOD__ );
-		if ( is_object( $wgProfiler ) ) {
-			$wgProfiler->setTemplated( true );
-		}
+		Profiler::instance()->setTemplated( true );
 
 		$oldid = $wgRequest->getVal( 'oldid' );
 		$diff = $wgRequest->getVal( 'diff' );