http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97575
Revision: 97575
Author: demon
Date: 2011-09-19 23:25:13 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Back-compat for $wgProfiler set as a class. Fix for r89206
Modified Paths:
--------------
trunk/phase3/includes/profiler/Profiler.php
Modified: trunk/phase3/includes/profiler/Profiler.php
===================================================================
--- trunk/phase3/includes/profiler/Profiler.php 2011-09-19 23:23:10 UTC (rev
97574)
+++ trunk/phase3/includes/profiler/Profiler.php 2011-09-19 23:25:13 UTC (rev
97575)
@@ -13,7 +13,7 @@
*/
function wfProfileIn( $functionname ) {
global $wgProfiler;
- if ( isset( $wgProfiler['class'] ) ) {
+ if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) )
{
Profiler::instance()->profileIn( $functionname );
}
}
@@ -24,7 +24,7 @@
*/
function wfProfileOut( $functionname = 'missing' ) {
global $wgProfiler;
- if ( isset( $wgProfiler['class'] ) ) {
+ if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) )
{
Profiler::instance()->profileOut( $functionname );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
