Remove back-compat profiling configuration
authorChad Horohoe <chadh@wikimedia.org>
Wed, 29 Oct 2014 00:20:39 +0000 (17:20 -0700)
committerChad Horohoe <chadh@wikimedia.org>
Wed, 29 Oct 2014 00:21:23 +0000 (17:21 -0700)
This old style was deprecated like 3 or 4 releases ago

Change-Id: Ic61424aacb376151019a08ade214fea655d82a3f

includes/profiler/Profiler.php

index 418b5d4..aaf899f 100644 (file)
@@ -143,14 +143,10 @@ abstract class Profiler {
                        if ( is_array( $wgProfiler ) ) {
                                if ( !isset( $wgProfiler['class'] ) ) {
                                        $class = 'ProfilerStub';
-                               } elseif ( $wgProfiler['class'] === 'Profiler' ) {
-                                       $class = 'ProfilerStub'; // b/c; don't explode
                                } else {
                                        $class = $wgProfiler['class'];
                                }
                                self::$__instance = new $class( $wgProfiler );
-                       } elseif ( $wgProfiler instanceof Profiler ) {
-                               self::$__instance = $wgProfiler; // back-compat
                        } else {
                                self::$__instance = new ProfilerStub( array() );
                        }