From: Chad Horohoe <chadh@wikimedia.org>
Date: Wed, 29 Oct 2014 00:20:39 +0000 (-0700)
Subject: Remove back-compat profiling configuration
X-Git-Tag: 1.31.0-rc.0~13458
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=d4c77064a2e580eddbfa78222d10bc9e95fda8b4;p=lhc%2Fweb%2Fwiklou.git

Remove back-compat profiling configuration

This old style was deprecated like 3 or 4 releases ago

Change-Id: Ic61424aacb376151019a08ade214fea655d82a3f
---

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 418b5d48b6..aaf899f8ff 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -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() );
 			}