Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.248.2.13 -r1.248.2.14
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	8 Mar 2016 21:44:24 -0000	1.248.2.13
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	11 Mar 2016 10:02:37 -0000	1.248.2.14
@@ -1869,6 +1869,7 @@
     {toolbar Full}
     {CSSclass xowiki-ckeditor}
     {uiColor ""}
+    {allowedContent "true"}
     {CSSclass xowiki-ckeditor}
     {customConfig "config.js"}
     {callback "/* callback code */"}
@@ -1985,7 +1986,8 @@
 
       if {"xowikiimage" in [my extraPlugins]} {
         my js_image_helper
-        set ready_callback {xowiki_image_callback(e.editor);}
+        set ready_callback "xowiki_image_callback(CKEDITOR.instances\['$id'\]);"
+        set ready_callback2 {xowiki_image_callback(e.editor);}
       } else {
         set ready_callback "/*none*/;"
         set submit_callback "/*none*/;"
@@ -2002,9 +2004,9 @@
         extraPlugins: '[join [my extraPlugins] ,]',
         contentsCss: '[my contentsCss]',
         imageSelectorDialog: '[my imageSelectorDialog]?parent_id=[[my object] item_id]',
-        ready_callback: '$ready_callback',
+        ready_callback: '$ready_callback2',
         customConfig: '[my customConfig]',
-        allowedContent: true,
+        allowedContent: '[my allowedContent]',
         textarea_id: '[my set id]'
       }]
       if {[my templatesFiles] ne ""} {
@@ -2097,7 +2099,8 @@
             \$(document).ready(function() {
               CKEDITOR.plugins.addExternal( 'xowikiimage', '/resources/xowiki/ckeditor4/plugins/xowikiimage/', 'plugin.js' );
               load_$id ();
-              CKEDITOR.instances['$id'].on('instanceReady',function(e) {$ready_callback});
+              $ready_callback
+              //CKEDITOR.instances['$id'].on('instanceReady',function(e) {$ready_callback});
             });
           }]
         }