From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Sat, 5 Apr 2014 18:09:16 +0000 (+0200)
Subject: Disabling profiling in the debug toolbar for ProfilerSimple (for now)
X-Git-Tag: 1.31.0-rc.0~16298^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=8fea0e67112f8c3207bed34626dcbde41ce39c43;p=lhc%2Fweb%2Fwiklou.git

Disabling profiling in the debug toolbar for ProfilerSimple (for now)

Throws a fatal error when using a ProfilerSimple subclass and the
debug toolbar (the problem is that $this->mCollated doesn't have
the same format in both cases):

Warning:  Invalid argument supplied for foreach() in includes/profiler/Profiler.php on line 625

Fatal error:  Unsupported operand types in includes/profiler/Profiler.php on line 633

Change-Id: I7f2bc714396a9249193a5828c154e09f7e0b5230
---

diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php
index 6331a3049e..36f4bd45ec 100644
--- a/includes/profiler/ProfilerSimple.php
+++ b/includes/profiler/ProfilerSimple.php
@@ -123,6 +123,12 @@ class ProfilerSimple extends Profiler {
 		}
 	}
 
+	public function getRawData() {
+		// Calling the method of the parent class results in fatal error.
+		// @todo Implement this correctly.
+		return array();
+	}
+
 	public function getFunctionReport() {
 		/* Implement in output subclasses */
 		return '';