IAlex has uploaded a new change for review. https://gerrit.wikimedia.org/r/124066
Change subject: Disabling profiling in the debug toolbar for ProfilerSimple (for now) ...................................................................... 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 --- M includes/profiler/ProfilerSimple.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/66/124066/1 diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php index 6331a30..36f4bd4 100644 --- a/includes/profiler/ProfilerSimple.php +++ b/includes/profiler/ProfilerSimple.php @@ -123,6 +123,12 @@ } } + 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 ''; -- To view, visit https://gerrit.wikimedia.org/r/124066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f2bc714396a9249193a5828c154e09f7e0b5230 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: IAlex <coderev...@emsenhuber.ch> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits