Index: openacs-4/packages/download/www/archive-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-add.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/download/www/archive-add.adp	13 Jan 2005 13:57:51 -0000	1.5
+++ openacs-4/packages/download/www/archive-add.adp	9 Sep 2013 17:56:22 -0000	1.5.2.1
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 
 <form enctype=multipart/form-data method=POST action="archive-add-2">
-<%= [export_form_vars archive_type_id return_url]%>
+<%= [export_vars -form {archive_type_id return_url}]%>
 
 <h3>#download.lt_Add_a_New_Software_Ar#</h3>
 
Index: openacs-4/packages/download/www/archive-version-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-version-add.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/download/www/archive-version-add.adp	13 Jan 2005 13:57:51 -0000	1.5
+++ openacs-4/packages/download/www/archive-version-add.adp	9 Sep 2013 17:56:22 -0000	1.5.2.1
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 
 <form enctype=multipart/form-data method=POST action="archive-version-add-2">
-<%= [export_form_vars archive_id return_url]%>
+<%= [export_vars -form {archive_id return_url}]%>
 
 <h3>#download.lt_Add_a_New_Archive_Rev#</h3>
 
Index: openacs-4/packages/download/www/download-verify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/download-verify.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/download/www/download-verify.adp	13 Jan 2005 13:57:51 -0000	1.8
+++ openacs-4/packages/download/www/download-verify.adp	9 Sep 2013 17:56:22 -0000	1.8.2.1
@@ -10,7 +10,7 @@
       </tr>
       <tr>
         <form method="post" action="@action@">
-          <%= [export_form_vars download_id revision_id] %>
+          <%= [export_vars -form {download_id revision_id}] %>
           <td align="right">#download.Reason_for_Download#</td> 
           <td> @reason_widget;noquote@ </td>
       </tr>
Index: openacs-4/packages/download/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/download/www/index.adp	13 Jan 2005 13:57:51 -0000	1.9
+++ openacs-4/packages/download/www/index.adp	9 Sep 2013 17:56:22 -0000	1.9.2.1
@@ -10,7 +10,7 @@
 @description@
 
     <if @user_id@ eq 0>
-      <p>#download.You_must# <strong><a href="/register/index?<%= [export_url_vars return_url] %>">register</a></strong>
+      <p>#download.You_must# <strong><a href="/register/index?<%= [export_vars -url {return_url}] %>">register</a></strong>
          #download.lt_before_you_can_downlo#
       </p>
     </if>
Index: openacs-4/packages/download/www/one-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-revision.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/download/www/one-revision.adp	13 Jan 2005 13:57:52 -0000	1.7
+++ openacs-4/packages/download/www/one-revision.adp	9 Sep 2013 17:56:22 -0000	1.7.2.1
@@ -13,7 +13,7 @@
 </if>
  <tr><td colspan=2 align=center>
                    [<a href=download-verify?revision_id=@revision_id@>#download.Download_Now#</a>]
-                   [<a href=one-archive?<%= [export_url_vars archive_id ]%>>#download.See_All_Versions#</a>]<br>&nbsp;</td>
+                   [<a href=one-archive?<%= [export_vars -url {archive_id }]%>>#download.See_All_Versions#</a>]<br>&nbsp;</td>
  </tr>
  <tr><td align=right valign=top><p>#download.Summary#</td>
      <td>@summary@</td>
Index: openacs-4/packages/download/www/admin/approve-or-reject.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject.adp,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/download/www/admin/approve-or-reject.adp	13 Jan 2005 13:57:52 -0000	1.6
+++ openacs-4/packages/download/www/admin/approve-or-reject.adp	9 Sep 2013 17:56:22 -0000	1.6.2.1
@@ -4,7 +4,7 @@
 
   <table>
   <form action=approve-or-reject-2.tcl>
-  <%=  [export_form_vars return_url action revision_id] %>
+  <%=  [export_vars -form {return_url action revision_id}] %>
   <tr><td colspan=2 align=right>
       [<a href=../one-archive?archive_id=@archive_id@>#download.Version_History#</a>]</td>
   </tr>