Revert "Update tinymce options merging to match fix in p.a.widgets an…

…d p.a.z3cform" This reverts commit c7aa528.
plone · Feb 19, 2016 · 0992e2c · 0992e2c
1 parent c7aa528
commit 0992e2c
Showing 1 changed file with 2 additions and 2 deletions.
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', {})
-        options = base_widgets.dict_merge(
+        merged = base_widgets.dict_merge(
             utils.get_tinymce_options(context, field, request),
             args['pattern_options'])
-        args['pattern_options'] = options
+        args['pattern_options'] = merged['pattern_options']
         return args
 
     def edit(self, context, field, request):