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.12 -r1.12.2.1 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 19 Jan 2018 14:09:48 -0000 1.12 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 16 May 2019 09:54:29 -0000 1.12.2.1 @@ -1,6 +1,6 @@ ad_page_contract { - Delete a package instance. If the package is + Delete a package instance. If the package is mounted it will be unmounted before deletion and an attempt will be made to delete the node. @@ -25,13 +25,13 @@ # you were at when you clicked "delete" or its parent (the case mentioned above). set parent [site_node::closest_ancestor_package \ - -node_id $node_id \ - -package_key acs-subsite \ - -element url] + -node_id $node_id \ + -package_key acs-subsite \ + -element url] # node_id was null so we're not deleting a mounted subsite instance if {$parent eq "" } { - set parent [ad_conn subsite_url] + set parent [ad_conn subsite_url] } if { $node_id ne "" } { @@ -47,14 +47,14 @@ } on_error { if {[db_string instance_delete_doubleclick_ck { - select decode(count(*), 0, 0, 1) from apm_packages - where package_id = :package_id + select decode(count(*), 0, 0, 1) from apm_packages + where package_id = :package_id } -default 0]} { - ad_return_error "Error Deleting Instance" "The following error was returned: -
[ns_quotehtml $errmsg]
" + ad_return_error "Error Deleting Instance" "The following error was returned: +
[ns_quotehtml $errmsg]
" } } - + ad_returnredirect ${parent}admin/site-map ad_script_abort