Index: openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	20 Apr 2004 21:12:35 -0000	1.11
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql	17 May 2004 15:14:44 -0000	1.12
@@ -133,7 +133,7 @@
 	fetch c_folder_children_cur into v_child_item_id;
 	exit when c_folder_children_cur%NOTFOUND;
 	if is_folder(v_child_item_id) = 't' then
-	  content_folder.del(v_child_item_id);
+	  content_folder.del(v_child_item_id,'t');
         else
 
          content_item.del(v_child_item_id);
@@ -186,15 +186,15 @@
   if label is not null and description is not null then 
 
     update cr_folders
-       set cr_folders.label = label,
-       cr_folders.description = description
-       where cr_folders.folder_id = folder_id;
+       set cr_folders.label = content_folder.rename.label,
+       cr_folders.description = content_folder.rename.description
+       where cr_folders.folder_id = content_folder.rename.folder_id;
 
   elsif label is not null and description is null then 
 
     update cr_folders
-       set cr_folders.label = label
-       where cr_folders.folder_id = folder_id;
+       set cr_folders.label = content_folder.rename.label
+       where cr_folders.folder_id = content_folder.rename.folder_id;
 
   end if;