Merge pull request #1972 from MGatner/fix-custom-collectors

Toolbar fix for custom collectors
codeigniter4 · Apr 25, 2019 · 8ac5c73 · 8ac5c73
2 parents b9c14be + 8fe6159
commit 8ac5c73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -232,9 +232,9 @@ protected function formatTimelineData(): array
 	/**
 	 * Returns the data of this collector to be formatted in the toolbar
 	 *
-	 * @return array
+	 * @return array|string
 	 */
-	public function display(): array
+	public function display()
 	{
 		return [];
 	}

diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -136,7 +136,7 @@
 				<div id="ci-<?= $c['titleSafe'] ?>" class="tab">
 					<h2><?= $c['title'] ?> <span><?= $c['titleDetails'] ?></span></h2>
 
-					<?= $parser->setData($c['display'])->render("_{$c['titleSafe']}.tpl") ?>
+					<?= is_string($c['display']) ? $c['display'] : $parser->setData($c['display'])->render("_{$c['titleSafe']}.tpl") ?>
 				</div>
 			<?php endif ?>
 		<?php endif ?>