Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.88 -r1.89
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	19 Jul 2007 22:06:15 -0000	1.88
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	22 Jul 2007 12:01:27 -0000	1.89
@@ -864,8 +864,11 @@
   }
 
   Page instproc delete {} {
-    my instvar package_id item_id name parent_id
-    $package_id delete -name $name -item_id $item_id
+    my instvar package_id item_id name
+    [my info class] delete -item_id $item_id
+    ::$package_id flush_references -item_id $item_id -name $name
+    ::$package_id returnredirect \
+	[my query_parameter "return_url" [$package_id package_url]]
   }
 
   Page instproc save-tags {} {
@@ -1012,6 +1015,17 @@
 #     }
 #   }
 
+  PageTemplate instproc delete {} {
+    my instvar package_id item_id name
+    set count [my count_entries]
+    my msg count=$count
+    if {$count > 0} {
+      $package_id error_msg [_ xowiki.error-delete_entries_first [list count $count]]
+    } else {
+      next
+    }
+  }
+
   Form instproc create-new {} {
     my instvar package_id
     set f [FormPage new -destroy_on_cleanup \