r97575 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97574‎ | r97575 | r97576 >
Date:23:25, 19 September 2011
Author:demon
Status:ok
Tags:
Comment:
Back-compat for $wgProfiler set as a class. Fix for r89206
Modified paths:
  • /trunk/phase3/includes/profiler/Profiler.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/profiler/Profiler.php
@@ -13,7 +13,7 @@
1414 */
1515 function wfProfileIn( $functionname ) {
1616 global $wgProfiler;
17 - if ( isset( $wgProfiler['class'] ) ) {
 17+ if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) ) {
1818 Profiler::instance()->profileIn( $functionname );
1919 }
2020 }
@@ -24,7 +24,7 @@
2525 */
2626 function wfProfileOut( $functionname = 'missing' ) {
2727 global $wgProfiler;
28 - if ( isset( $wgProfiler['class'] ) ) {
 28+ if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) ) {
2929 Profiler::instance()->profileOut( $functionname );
3030 }
3131 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r97577MFT r97575aaron23:30, 19 September 2011
r97673REL1_18 MFT r96760, r76765, r96810, r97551, r97552, r97575, r97607, r97608, r...reedy22:36, 20 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r89206* Made the profiler work in HipHop:...tstarling06:05, 31 May 2011

Status & tagging log