Merge branch 'dev' into 12-dev

This commit is contained in:
Fred Tempez 2022-03-21 18:58:11 +01:00
commit 4b11331f81
1 changed files with 5 additions and 4 deletions

View File

@ -2952,10 +2952,11 @@ class core extends common {
'style' => file_get_contents($stylePath) 'style' => file_get_contents($stylePath)
]); ]);
} }
if ($output['style']) { if ($output['style'] &&
$this->addOutput([ file_exists($output['style'])) {
'style' => $this->output['style'] . file_get_contents($output['style']) $this->addOutput([
]); 'style' => $this->output['style'] . file_get_contents($output['style'])
]);
} }
// JS // JS