Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -N -r1.48 -r1.49
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	15 Sep 2017 20:03:12 -0000	1.48
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	3 Nov 2017 15:11:20 -0000	1.49
@@ -202,10 +202,7 @@
 
   <fullquery name="fs::delete_folder.delete_folder">
      <querytext>
-        select file_storage__delete_folder (
-                       :folder_id,
-                       :cascade_p
-                       )
+       select content_folder__del(:folder_id, :cascade_p)
      </querytext>
   </fullquery>
   
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -N -r1.71 -r1.72
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	1 Oct 2017 12:09:46 -0000	1.71
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	3 Nov 2017 15:11:20 -0000	1.72
@@ -1155,7 +1155,7 @@
     }
 
     set version_name [get_object_name -object_id $folder_id]
-    db_exec_plsql delete_folder ""
+    db_string delete_folder {}
     
     if { !$no_notifications_p } {
         fs::do_notifications -folder_id $parent_id -filename $version_name -item_id $folder_id -action "delete_folder"
Index: openacs-4/packages/file-storage/www/folder-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/file-storage/www/folder-delete.tcl	7 Aug 2017 23:48:11 -0000	1.13
+++ openacs-4/packages/file-storage/www/folder-delete.tcl	3 Nov 2017 15:11:20 -0000	1.14
@@ -74,12 +74,9 @@
 
 if { $confirmed_p == "t" && $blocked_p == "f" } {
     # they have confirmed that they want to delete the folder
+    fs::delete_folder \
+        -folder_id $folder_id
 
-    db_1row parent_id "
-    select parent_id from cr_items where item_id = :folder_id"
-
-    db_exec_plsql folder_delete ""
-
     ad_returnredirect "index?folder_id=$parent_id"
     ad_script_abort