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

Fix #565 Allow other units in editor config

Browse source
This commit is contained in:
Kijin Sung 2016-08-10 20:51:12 +09:00
parent 72785b0965
commit 1d11ad7357
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/editor/editor.admin.controller.php
View file

@ -164,10 +164,14 @@ class editorAdminController extends editor
$config->font_defined = $configVars->font_defined = 'N';
$config->content_font = $configVars->content_font;
}
$config->content_font_size = intval($configVars->content_font_size) . 'px';
$config->content_line_height = intval($configVars->content_line_height) . '%';
$config->content_paragraph_spacing = intval($configVars->content_paragraph_spacing) . 'px';
$config->content_font_size = trim($configVars->content_font_size);
$config->content_font_size = ctype_digit($config->content_font_size) ? ($config->content_font_size . 'px') : $config->content_font_size;
$config->content_line_height = trim($configVars->content_line_height);
$config->content_line_height = ctype_digit($config->content_line_height) ? ($config->content_line_height . '%') : $config->content_line_height;
$config->content_paragraph_spacing = trim($configVars->content_paragraph_spacing);
$config->content_paragraph_spacing = ctype_digit($config->content_paragraph_spacing) ? ($config->content_paragraph_spacing . '%') : $config->content_paragraph_spacing;
$config->content_word_break = $configVars->content_word_break;
$config->content_word_break = in_array($config->content_word_break, array('normal', 'keep-all', 'break-all', 'none')) ? $config->content_word_break : 'normal';
$oModuleController->insertModuleConfig('editor', $config);
$this->setRedirectUrl(Context::get('error_return_url'));