Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl,v diff -u -N -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 18 Sep 2015 07:27:48 -0000 1.10.2.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 9 Jan 2017 16:49:27 -0000 1.10.2.3 @@ -35,14 +35,15 @@ } if { $node_id ne "" } { - # The package is mounted + # The package is mounted, unmount it and delete it together + # with the site node site_node::unmount -node_id $node_id - site_node::delete -node_id $node_id + site_node::delete -node_id $node_id -delete_subnodes + } else { + # Delete the package + apm_package_instance_delete $package_id } - # Delete the package - apm_package_instance_delete $package_id - } on_error { if {[db_string instance_delete_doubleclick_ck { select decode(count(*), 0, 0, 1) from apm_packages