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 -r1.201 -r1.202
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	14 Feb 2012 10:15:44 -0000	1.201
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	14 Feb 2012 14:42:07 -0000	1.202
@@ -1501,6 +1501,13 @@
       set package_id [[my object] package_id]
       #my extraPlugins {timestamp xowikiimage}
 
+      if {[lsearch [my extraPlugins] xowikiimage] > -1} {
+	my js_image_helper
+	set ready_callback {xowiki_image_callback(e.editor);}
+      } else {
+	set ready_callback "/*none*/;"
+      }
+      
       set options [subst {
 	toolbar : '[my toolbar]',
 	uiColor: '[my uiColor]',
@@ -1512,13 +1519,10 @@
 	extraPlugins: '[join [my extraPlugins] ,]',
 	contentsCss: '[my contentsCss]',
 	imageSelectorDialog: '[my imageSelectorDialog]',
+	ready_callback: '$ready_callback',
 	customConfig: '[my customConfig]'
       }]
 
-      if {[lsearch [my extraPlugins] xowikiimage] > -1} {
-	my js_image_helper
-      }
-
       #set parent [[[my object] package_id] get_page_from_item_or_revision_id [[my object] parent_id]];# ???
 
       if {[my set inplace]} {
@@ -1554,7 +1558,7 @@
 	    \$( '#$id' ).ckeditor(function() { $callback }, {
 	      $options
 	    });
-            CKEDITOR.instances['$id'].on('instanceReady',function(e) {xowiki_image_callback(e.editor);});
+            CKEDITOR.instances['$id'].on('instanceReady',function(e) {$ready_callback});
 	  });
 	}]
 	next