From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Fri, 9 Jan 2015 09:15:30 +0000 (+0100)
Subject: Unbreak master by restoring Profiler::profile(In|Out)
X-Git-Tag: 1.31.0-rc.0~12742
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=a7f7f8cbcb14a2ca597b5510d2549e74b3617667;p=lhc%2Fweb%2Fwiklou.git

Unbreak master by restoring Profiler::profile(In|Out)

Keep functions in the abstract class to keep BC with SMW.

To I781f62be9

Change-Id: I81d3912cbffc88ed66c9d6d787db9f1ffe3b2de3
---

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 6e1278ff1f..9bb2db9948 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -118,6 +118,10 @@ abstract class Profiler {
 		}
 	}
 
+	// Kept BC for now, remove when possible
+	public function profileIn( $functionname ) {}
+	public function profileOut( $functionname ) {}
+
 	/**
 	 * Mark the start of a custom profiling frame (e.g. DB queries).
 	 * The frame ends when the result of this method falls out of scope.