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

diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php
index 6331a30..36f4bd4 100644 (file)
--- 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 '';