Skip to content

Commit 92a3405

Browse files
committed
fix: DEBUG-VIEW comments are not output
1 parent 8744d96 commit 92a3405

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

system/View/View.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,19 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
261261
$this->renderVars['view']
262262
);
263263

264-
$afterFilters = service('filters')->getFiltersClass()['after'];
264+
// Check if DebugToolbar is enabled.
265+
$filters = Services::filters();
266+
$requiredAfterFilters = $filters->getRequiredFilters('after')[0];
267+
if (in_array('toolbar', $requiredAfterFilters, true)) {
268+
$debugBarEnabled = true;
269+
} else {
270+
$afterFilters = $filters->getFiltersClass()['after'];
271+
$debugBarEnabled = in_array(DebugToolbar::class, $afterFilters, true);
272+
}
273+
265274
if (
266-
($this->debug && (! isset($options['debug']) || $options['debug'] === true))
267-
&& in_array(DebugToolbar::class, $afterFilters, true)
275+
$this->debug && $debugBarEnabled
276+
&& (! isset($options['debug']) || $options['debug'] === true)
268277
) {
269278
$toolbarCollectors = config(Toolbar::class)->collectors;
270279

0 commit comments

Comments
 (0)