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

Issue 2850, [maserati] problem of added slashes in content since font-family css

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12626 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2013-01-31 02:20:04 +00:00
parent 236af09a5c
commit bcb1afcab0
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -145,9 +145,9 @@ class editorAdminController extends editor
else $config->font_defined = 'Y';
if($config->font_defined == 'Y')
$config->content_font = addslashes($configVars->content_font_defined);
$config->content_font = $configVars->content_font_defined;
else
$config->content_font = addslashes($configVars->content_font);
$config->content_font = $configVars->content_font;
$config->editor_skin = $configVars->editor_skin;
$config->editor_height = $configVars->editor_height;

2
modules/editor/editor.model.php
View file

@ -220,7 +220,7 @@ class editorModel extends editor
if(!$option->content_style) $option->content_style = 'default';
Context::set('content_style', $option->content_style);
// Default font setting
Context::set('content_font', $option->content_font);
Context::set('content_font', addslashes($option->content_font));
Context::set('content_font_size', $option->content_font_size);
// Option setting to allow auto-save