From ef2d80fde9baf4cd607c7c45875158f5750a5799 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 5 Aug 2009 08:36:21 +0000 Subject: [PATCH] 2009-08-05 Kazuhiko * escape LINE SEPARATOR (U+2028) and PARAGRAPH SEPARATOR (U+2029) in fckeditor_wysiwyg_support otherwise FCKeditor will raise an error. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28279 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml | 2 ++ product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log | 3 +++ product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml index a1aca7818c..e8829ddf0f 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml @@ -44,6 +44,8 @@ cleaninput python: cleaninput.replace(\'\\x27\',\'\\x5C\\x27\');\n cleaninput python: cleaninput.replace(\'\\r\',\'\\x5C\\x72\');\n cleaninput python: cleaninput.replace(\'\\n\',\'\\x5C\\x6E\');\n + cleaninput python: cleaninput.replace(\'\\xE2\\x80\\xA8\',\'\\\\u2028\');\n + cleaninput python: cleaninput.replace(\'\\xE2\\x80\\xA9\',\'\\\\u2029\');\n site_root python: getattr(here, \'getWebSiteValue\', here.getPortalObject)();\n portal_url python: site_root.absolute_url();\n server_url request/BASE0;\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index 28a6065a42..82104a778a 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -1,3 +1,6 @@ +2009-08-05 Kazuhiko +* escape LINE SEPARATOR (U+2028) and PARAGRAPH SEPARATOR (U+2029) in fckeditor_wysiwyg_support otherwise FCKeditor will raise an error. + 2009-06-23 Kazuhiko * update FCKeditor to 2.6.4.1. diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 35d29653bf..3430d41490 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -791 \ No newline at end of file +792 \ No newline at end of file -- 2.30.9