Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	4 Feb 2011 23:50:47 -0000	1.2
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	23 May 2011 10:40:07 -0000	1.3
@@ -429,6 +429,13 @@
     my get_parameters
 
     set current_folder [my set __including_page]
+    if {![$current_folder istype ::xowiki::FormPage]} {
+      # current folder has to be a FormPage
+      set current_folder [$current_folder parent_id]
+      if {![$current_folder istype ::xowiki::FormPage]} {
+	error "child-resources not included from a FormPage"
+      }
+    }
     set current_folder_id [$current_folder item_id]
 
     if {[::xo::cc query_parameter m] ne "list"} {
@@ -501,7 +508,7 @@
 	set name [$c name]
         set page_link [::$package_id pretty_link -parent_id $logical_folder_id $name]
 	array set icon [$c render_icon]
-        
+
         $t add \
             -ID [$c name] \
             -name [$c pretty_name] \
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.191 -r1.192
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	24 Feb 2011 09:40:34 -0000	1.191
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	23 May 2011 10:38:06 -0000	1.192
@@ -1400,7 +1400,7 @@
     if {![my istype ::xowiki::formfield::richtext] || $disabled } {
       my render_richtext_as_div
     } else {
-      ::xo::Page requireJS "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
+      ::xo::Page requireJS "/resources/xowiki/jquery/jquery.min.js"
       ::xo::Page requireJS "/resources/xowiki/ckeditor/ckeditor.js"
       ::xo::Page requireJS "/resources/xowiki/ckeditor/adapters/jquery.js"
 
@@ -1453,7 +1453,7 @@
       my render_richtext_as_div
     } else {
       ::xo::Page requireCSS "/resources/xowiki/wymeditor/skins/default/screen.css"
-      ::xo::Page requireJS  "/resources/xowiki/jquery/jquery.js"
+      ::xo::Page requireJS "/resources/xowiki/jquery/jquery.min.js"
       ::xo::Page requireJS  "/resources/xowiki/wymeditor/jquery.wymeditor.pack.js"
       set postinit ""
       foreach plugin {hovertools resizable fullscreen embed} {
@@ -2259,7 +2259,12 @@
       # file exists already
       return 1
     }
-    if {[catch {
+    if {[regexp {^file://(.*)$} $value _ path]} {
+      set f [open $path r]
+      fconfigure $f translation binary
+      set img [read $f] 
+      close $f
+    } elseif {[catch {
       set r [::xo::HttpRequest new -url $value -volatile]
       set img [$r set data]
     } errorMsg]} {