From 721fd931a527753bb04714b48ff0673f9d1a5b80 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 7 Jan 2010 10:01:29 +0000 Subject: [PATCH] replace '\\' to '\\\\' in fckeditor_wysiwyg_support, instead of doing in each my_text_content field. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31622 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../my_text_content.xml | 23 ----------------- bt5/erp5_base/bt/revision | 2 +- .../DiscussionPost_view/my_text_content.xml | 25 ++----------------- .../my_text_content.xml | 22 ++-------------- bt5/erp5_discussion/bt/revision | 2 +- .../WebPage_viewEditor/my_text_content.xml | 23 ----------------- bt5/erp5_web/bt/revision | 2 +- .../fckeditor_wysiwyg_support.xml | 1 + .../bootstrap/erp5_xhtml_style/bt/revision | 2 +- 9 files changed, 9 insertions(+), 93 deletions(-) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.xml index eb6a17fb39..9d37c94917 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationMessage_viewEditor/my_text_content.xml @@ -15,7 +15,6 @@ <list> <string>height</string> <string>editable</string> - <string>default</string> </list> </value> </item> @@ -57,12 +56,6 @@ <key> <string>tales</string> </key> <value> <dictionary> - <item> - <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -108,20 +101,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python:here.getTextContent().replace(\'\\\\\', \'\\\\\\\\\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 38017008e6..0552576c87 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -668 \ No newline at end of file +669 \ No newline at end of file diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_view/my_text_content.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_view/my_text_content.xml index ca8077d035..cd6665472d 100644 --- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_view/my_text_content.xml +++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_view/my_text_content.xml @@ -133,9 +133,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> @@ -184,7 +182,7 @@ <item> <key> <string>text_editor</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -293,25 +291,6 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python:here.getTextContent().replace(\'\\\\\', \'\\\\\\\\\')</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_viewEditor/my_text_content.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_viewEditor/my_text_content.xml index da16a69d45..9ee73341f5 100644 --- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_viewEditor/my_text_content.xml +++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_viewEditor/my_text_content.xml @@ -133,9 +133,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> @@ -184,7 +182,7 @@ <item> <key> <string>text_editor</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -293,22 +291,6 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python:here.getTextContent() and here.getTextContent().replace(\'\\\\\', \'\\\\\\\\\') or None</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/> diff --git a/bt5/erp5_discussion/bt/revision b/bt5/erp5_discussion/bt/revision index 3f10ffe7a4..19c7bdba7b 100644 --- a/bt5/erp5_discussion/bt/revision +++ b/bt5/erp5_discussion/bt/revision @@ -1 +1 @@ -15 \ No newline at end of file +16 \ No newline at end of file diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewEditor/my_text_content.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewEditor/my_text_content.xml index ce2dd71516..7d094502ec 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewEditor/my_text_content.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewEditor/my_text_content.xml @@ -13,7 +13,6 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>default</string> <string>description</string> <string>editable</string> <string>height</string> @@ -59,12 +58,6 @@ <key> <string>tales</string> </key> <value> <dictionary> - <item> - <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> @@ -138,20 +131,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: (lambda x: field.get_value(\'text_editor\') == \'fck_editor\' and x.replace(\'\\\\\', \'\\\\\\\\\') or x)(here.getTextContent() or \'\')</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 6e3b01e5e2..f30735b327 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -883 \ No newline at end of file +884 \ No newline at end of file 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 54cd4e5cf3..ddfaf2ac2d 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 @@ -41,6 +41,7 @@ <tal:block tal:define="baseHrefUrl here/absolute_url;\n cleaninput python: inputvalue;\n + cleaninput python: cleaninput.replace(\'\\\\\',\'\\\\\\\\\');\n cleaninput python: cleaninput.replace(\'\\x27\',\'\\x5C\\x27\');\n cleaninput python: cleaninput.replace(\'\\r\',\'\\x5C\\x72\');\n cleaninput python: cleaninput.replace(\'\\n\',\'\\x5C\\x6E\');\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index c73598001b..8800cb9cad 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -863 \ No newline at end of file +864 \ No newline at end of file -- 2.30.9