Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl	27 Oct 2014 16:39:53 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl	27 Jun 2015 16:03:13 -0000	1.6
@@ -33,9 +33,9 @@
 
 }
 
-set return_url_enc [ad_urlencode "[ad_conn url]?[export_vars {rel_segment constraint_name rel_side required_rel_segment return_url}]"]
+set return_url_enc [ad_urlencode [export_vars -base [ad_conn url] {rel_segment constraint_name rel_side required_rel_segment return_url}]]
 
-set context [list [list "../" "Relational segments"] [list "../one?segment_id=$rel_segment" "One Segment"] "Add constraint"]
+set context [list [list "../" "Relational segments"] [list [export_vars -base ../one {{segment_id $rel_segment}}] "One Segment"] "Add constraint"]
 
 set package_id [ad_conn package_id]