Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Aug 2006 00:37:52 -0000	1.5
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Aug 2006 15:42:06 -0000	1.6
@@ -108,7 +108,7 @@
       $page save_new
       return [my call $policy $page $method]
     } else {
-      ad_returnredirect "admin/list"
+      ad_returnredirect "[my package_url]admin/list"
     }
   }
 
Index: openacs-4/packages/xowiki/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/xowiki/www/admin/index.tcl	26 Jul 2006 22:56:46 -0000	1.10
+++ openacs-4/packages/xowiki/www/admin/index.tcl	9 Aug 2006 15:42:06 -0000	1.11
@@ -39,12 +39,14 @@
     "select object_type from acs_object_types where 
         tree_sortkey between :object_type_key and tree_right(:object_type_key)
     " {
+
+      set return_url [export_vars -base ${base}admin {object_type}]
       t1 add \
 	  -object_type $object_type \
 	  -instances [db_list count [$object_type instance_select_query \
 				 -folder_id $folder_id -count 1 -with_subtypes false]] \
 	  -instances.href [export_vars -base ./list {object_type}] \
-	  -edit.href   [export_vars -base $base {{edit-new 1} object_type}] \
+	  -edit.href   [export_vars -base $base {{edit-new 1} object_type return_url}] \
 	  -delete.href [export_vars -base delete-type {object_type}] \
 	  -edit.title  [_ xotcl-core.add [list type [$object_type pretty_name]]] \
 	  -delete.title  "Delete all [$object_type pretty_plural] of this instance"
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/admin/list.tcl	5 Aug 2006 20:55:08 -0000	1.2
+++ openacs-4/packages/xowiki/www/admin/list.tcl	9 Aug 2006 15:42:06 -0000	1.3
@@ -85,7 +85,7 @@
 	       -name.href $page_link \
 	       -last_modified $last_modified \
 	       -size $content_length \
-	       -edit.href [export_vars -base $page_link {{m edit}}] \
+	       -edit.href [export_vars -base $page_link {{m edit} return_url}] \
 	       -mod_user [::xo::get_user_name $creation_user] \
 	       -delete.href [export_vars -base $page_link {{m delete} return_url}]
   	 }