| Index: branches/wmf/1.18wmf1/includes/profiler/Profiler.php |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | */ |
| 15 | 15 | function wfProfileIn( $functionname ) { |
| 16 | 16 | global $wgProfiler; |
| 17 | | - if ( isset( $wgProfiler['class'] ) ) { |
| | 17 | + if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) ) { |
| 18 | 18 | Profiler::instance()->profileIn( $functionname ); |
| 19 | 19 | } |
| 20 | 20 | } |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | */ |
| 26 | 26 | function wfProfileOut( $functionname = 'missing' ) { |
| 27 | 27 | global $wgProfiler; |
| 28 | | - if ( isset( $wgProfiler['class'] ) ) { |
| | 28 | + if ( $wgProfiler instanceof Profiler || isset( $wgProfiler['class'] ) ) { |
| 29 | 29 | Profiler::instance()->profileOut( $functionname ); |
| 30 | 30 | } |
| 31 | 31 | } |