Merge branch 'dev' into 12-dev
This commit is contained in:
commit
4b11331f81
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user