Index: openacs-4/packages/learning-content/www/content-admin/category-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/learning-content/www/content-admin/category-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/learning-content/www/content-admin/category-delete.tcl	5 Mar 2009 21:29:04 -0000	1.1
+++ openacs-4/packages/learning-content/www/content-admin/category-delete.tcl	25 Aug 2009 23:26:49 -0000	1.2
@@ -13,20 +13,23 @@
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege admin
 
-set tree_list [learning_content::category::get_tree_levels -subtree_id $category_id \
-    -tree_id $tree_id]
-set tree_list [linsert $tree_list 0 $category_id]
-foreach category $tree_list {
-    set my_category_id [lindex $category 0]
-    if {[db_string check_mapped_objects {*SQL*}] eq 1} {
-        ad_return_complaint 1 "[_ learning-content.mapped_objects]"
-        ad_script_abort
+set delete_p [learning_content::category::delete_p -tree_id $tree_id -category_id $category_id]
+if {$delete_p} {
+    set tree_list [learning_content::category::get_tree_levels -subtree_id $category_id \
+        -tree_id $tree_id]
+    set tree_list [linsert $tree_list 0 $category_id]
+    foreach category $tree_list {
+        set my_category_id [lindex $category 0]
+        if {[db_string check_mapped_objects {*SQL*}] eq 1} {
+            ad_return_complaint 1 "[_ learning-content.mapped_objects]"
+            ad_script_abort
+        }
+        lappend category_ids $my_category_id
     }
-    lappend category_ids $my_category_id
-}
-
-set result [learning_content::category::delete -tree_id $tree_id \
-    -category_ids $category_ids]
-if {$result eq 0} {
-    ad_return_complaint 1 "[_ learning-content.still_contains_subcategories]"
-}
+    
+    set result [learning_content::category::delete -tree_id $tree_id \
+        -category_ids $category_ids]
+    if {$result eq 0} {
+        ad_return_complaint 1 "[_ learning-content.still_contains_subcategories]"
+    }
+}
\ No newline at end of file