From 8fea0e67112f8c3207bed34626dcbde41ce39c43 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 5 Apr 2014 20:09:16 +0200 Subject: [PATCH] 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 --- includes/profiler/ProfilerSimple.php | 6 ++++++ 1 file changed, 6 insertions(+) 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 ''; -- 2.20.1