Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.57 -r1.58
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	3 Oct 2008 12:06:14 -0000	1.57
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	6 Oct 2008 14:15:20 -0000	1.58
@@ -2871,8 +2871,9 @@
       array set __ia [$p instance_attributes]
       if {[expr $uc(tcl)]} continue
       #if {![expr $wc(tcl)]} continue ;# already handled in get_children
-      set page_link [$package_id pretty_link [$p name]]
 
+      set page_link [$package_id pretty_link -parent_id [$p parent_id] [$p name]]
+
       t1 add \
           -delete delete \
           -delete.href [$package_id make_link -link $page_link $p delete return_url] \
@@ -2888,6 +2889,7 @@
       foreach __fn $field_names {
         $__c set $__fn [$__ff($__fn) pretty_value [$p property $__fn]]
       }
+      $__c set _name [$package_id external_name -parent_id [$p parent_id] [$p name]]
     }
 
     #
@@ -2923,7 +2925,7 @@
     }
 
     set links [list]
-    set base [$package_id pretty_link [$form_item name]]
+    set base [$package_id pretty_link -parent_id [$form_item parent_id] [$form_item name]]
     set label [$form_item name]
 
     if {$with_form_link} {