Merge pull request #52 from plone/navroot-fixes

Fix tinymce options merging to be compatible with change in p.a.widgets and p.a.z3cform.
plone · Feb 22, 2016 · 1d90faf · 1d90faf
2 parents 0992e2c + 6ef4a03
commit 1d90faf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,7 +10,10 @@ New:
 
 Fixes:
 
-- *add item here*
+- Fix tinymce pattern-options merging to be compatible with change in
+  p.a.widgets and p.a.z3cform.
+  [alecm]
+
 
 
 1.10.12 (2016-02-15)

diff --git a/Products/Archetypes/Widget.py b/Products/Archetypes/Widget.py
@@ -1396,10 +1396,10 @@ def _base_args(self, context, field, request):
                          ).decode('utf-8')
 
         args.setdefault('pattern_options', {})
-        merged = base_widgets.dict_merge(
+        options = base_widgets.dict_merge(
             utils.get_tinymce_options(context, field, request),
             args['pattern_options'])
-        args['pattern_options'] = merged['pattern_options']
+        args['pattern_options'] = options
         return args
 
     def edit(self, context, field, request):