Index: openacs-4/packages/general-comments/www/test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/test.adp,v
diff -u -r1.5.6.1 -r1.5.6.2
--- openacs-4/packages/general-comments/www/test.adp	11 Sep 2013 18:40:27 -0000	1.5.6.1
+++ openacs-4/packages/general-comments/www/test.adp	16 Sep 2014 13:22:33 -0000	1.5.6.2
@@ -32,7 +32,7 @@
       <i>#general-comments.not_set#</i>
     </if>
     <else>
-      <a href="/admin/site-map/parameter-set?package_id=@package_id@">
+      <a href="@params_url@">
       @auto_approve_comments_p@</a>
     </else></td></tr>
 <tr>
@@ -42,7 +42,7 @@
       <i>#general-comments.not_set#</i>
     </if>
     <else>
-      <a href="/admin/site-map/parameter-set?package_id=@package_id@">
+      <a href="@params_url@">
       @allow_file_attachments_p@</a>
     </else></td></tr>
 <tr>
@@ -52,7 +52,7 @@
       <i>#general-comments.not_set#</i>
     </if>
     <else>
-      <a href="/admin/site-map/parameter-set?package_id=@package_id@">
+      <a href="@params_url@">
       @allow_link_attachments_p@</a>
     </else></td></tr>
 <tr>
@@ -62,7 +62,7 @@
       <i>#general-comments.not_set#</i>
     </if>
     <else>
-      <a href="/admin/site-map/parameter-set?package_id=@package_id@">
+      <a href="@params_url@">
       @max_file_size@</a>
     </else></td></tr>
 </table>
Index: openacs-4/packages/general-comments/www/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/test.tcl,v
diff -u -r1.4.20.1 -r1.4.20.2
--- openacs-4/packages/general-comments/www/test.tcl	7 Sep 2013 08:57:02 -0000	1.4.20.1
+++ openacs-4/packages/general-comments/www/test.tcl	16 Sep 2014 13:22:33 -0000	1.4.20.2
@@ -45,4 +45,7 @@
 set full_comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $package_id "${package_url}test"]
 set link [general_comments_create_link $package_id "${package_url}test" ]
 
+set return_url [ad_conn url]
+set params_url [export_vars -base /shared/parameters {package_id return_url}]
+
 ad_return_template