Merge 7d215ac into 1b8fbfb

plone · Sep 26, 2016 · 8c8783f · 8c8783f
2 parents 1b8fbfb + 7d215ac
commit 8c8783f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,7 +2,11 @@ Changelog
 =========
 
 1.9.1 (unreleased)
------------------
+------------------
+
+- Use the RAW text for Archetypes based TinyMCE content, this fixes
+  image handling with TinyMCE.
+  [pcdummy]
 
 - Possible to use Rich Text (TinyMCE 4, properly configured) pattern
   in Dexterity types other than plone.app.contenttypes implementation,

diff --git a/plone/app/widgets/at.py b/plone/app/widgets/at.py
@@ -578,7 +578,7 @@ def _base_args(self, context, field, request):
         charset = properties.site_properties.getProperty('default_charset',
                                                          'utf-8')
         args['value'] = (request.get(field.getName(),
-                                     field.getAccessor(context)())
+                                     field.getRaw(context))
                          ).decode(charset)
 
         args.setdefault('pattern_options', {})