Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -N -r1.81 -r1.82
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	15 Nov 2010 15:26:21 -0000	1.81
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	23 Nov 2010 07:50:04 -0000	1.82
@@ -26,8 +26,8 @@
 
   BaseLink instproc mk_css_class_and_id {{-additional ""} {-default ""}} {
     if {[my exists cssid]} {set id "id='[my cssid]'"} else {set id ""}
-    set cls [my mk_css_class -additional external]
-    return "$cls $id"
+    set cls [my mk_css_class -additional $additional -default $default]
+    return [string trim "$cls $id"]
   }
 
   #
Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v
diff -u -N -r1.67 -r1.68
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	22 Nov 2010 12:19:19 -0000	1.67
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	23 Nov 2010 07:50:04 -0000	1.68
@@ -36,8 +36,12 @@
   } {
     ns_log notice "Executing before-uninstantiate"
     ::xowiki::delete_gc_messages -package_id $package_id
-    ::xo::db::sql::content_item delete \
-	-item_id [::xo::db::CrClass lookup -name "xowiki: $package_id" -parent_id -100]
+    set root_folder_id [::xo::db::CrClass lookup -name "xowiki: $package_id" -parent_id -100]
+    if {[db_0or1row is_transformed_folder "select 1 from cr_folders where folder_id = $root_folder_id"]} {
+      ::xo::db::sql::content_folder delete -folder_id $root_folder_id -cascade_p 1
+    } else {
+      ::xo::db::sql::content_item delete -item_id $root_folder_id
+    }
     ns_log notice "          before-uninstantiate DONE"
   }