From bcb1afcab050562d927e4397b2e22f0b7f605eba Mon Sep 17 00:00:00 2001 From: chschy Date: Thu, 31 Jan 2013 02:20:04 +0000 Subject: [PATCH] Issue 2850, [maserati] problem of added slashes in content since font-family css git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12626 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/editor.admin.controller.php | 4 ++-- modules/editor/editor.model.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php index b79d6bfe0..d84fbc32f 100644 --- a/modules/editor/editor.admin.controller.php +++ b/modules/editor/editor.admin.controller.php @@ -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; diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 7e218c4cc..6b1f71521 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -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