fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing default font config under some circumstances

Browse source
This commit is contained in:
Kijin Sung 2017-03-01 14:25:18 +09:00
parent 24b8cf81ad
commit 1233919dba
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -270,11 +270,9 @@ class FrontEndFileHandler extends Handler
{
return;
}
if ($default_font_config = Context::get('default_font_config'))
{
$file->vars = array_merge($file->vars, $default_font_config);
}
$default_font_config = Context::get('default_font_config') ?: getController('editor')->default_font_config;
$file->vars = array_merge($file->vars, $default_font_config);
if ($file->fileExtension === 'less')
{
$file->vars = array_map(function($str) {