Index: openacs-4/packages/download/tcl/download-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/tcl/download-procs.tcl,v
diff -u -N -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/download/tcl/download-procs.tcl	6 Sep 2013 16:36:34 -0000	1.12.2.1
+++ openacs-4/packages/download/tcl/download-procs.tcl	9 Sep 2013 17:34:16 -0000	1.12.2.2
@@ -23,7 +23,7 @@
             if { $admin_p } {
                 set repository_id [db_nextval acs_object_id_seq]
                 set return_url "[ad_conn package_url]admin/repository-types"
-                ad_return_exception_page 200 "Not setup" "Please <a href=\"[ad_conn package_url]admin/repository-ae?[export_url_vars repository_id return_url]\">configure this instance of the download module</a>."
+                ad_return_exception_page 200 "Not setup" "Please <a href=\"[ad_conn package_url]admin/repository-ae?[export_vars -url {repository_id return_url}]\">configure this instance of the download module</a>."
             } else {
                 ad_return_exception_page 200 "Not setup" "Please have an admin configure this instance of the download module."
             }
@@ -37,7 +37,7 @@
             }]
                 if { $count == 0 } {
                     set return_url "[ad_conn url]?[ad_conn query]"
-                    ad_return_exceptio_page 200 "Not setup" "Please <a href=\"[ad_conn package_url]admin/repository-types?[export_url_vars repository_id return_url]\">add a download type</a>."
+                    ad_return_exceptio_page 200 "Not setup" "Please <a href=\"[ad_conn package_url]admin/repository-types?[export_vars -url {repository_id return_url}]\">add a download type</a>."
                     ad_script_abort
                 }
             }
Index: openacs-4/packages/download/www/all-metadata.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/all-metadata.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/download/www/all-metadata.tcl	24 Feb 2005 13:33:11 -0000	1.4
+++ openacs-4/packages/download/www/all-metadata.tcl	9 Sep 2013 17:34:16 -0000	1.4.2.1
@@ -23,7 +23,7 @@
 
 set table_def [list \
     [list $metadata_select $pretty_name {} \
-        "<td><a href=one-metadata?[export_url_vars metadata_id]&value=\[ad_urlencode \$$metadata_select\]>\$$metadata_select</td>"] \
+        "<td><a href=one-metadata?[export_vars -url {metadata_id}]&value=\[ad_urlencode \$$metadata_select\]>\$$metadata_select</td>"] \
     {version_count "[_ download._Versions]" 
         {version_count $order}
         {<td>$version_count</td>}} \
Index: openacs-4/packages/download/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.tcl,v
diff -u -N -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/download/www/index.tcl	6 Sep 2013 16:36:34 -0000	1.8.2.1
+++ openacs-4/packages/download/www/index.tcl	9 Sep 2013 17:34:16 -0000	1.8.2.2
@@ -95,7 +95,7 @@
     append metadata_selects ", (select $answer_column from download_revision_data where revision_id = dar.revision_id and metadata_id = $metadata_id) as $metadata_select
     "
     if { $linked_p == "t" } {
-        set display "<td><a href=one-metadata?[export_url_vars metadata_id]&value=\[ad_urlencode \$$metadata_select\]>\$$metadata_select</td>"
+        set display "<td><a href=one-metadata?[export_vars -url {metadata_id}]&value=\[ad_urlencode \$$metadata_select\]>\$$metadata_select</td>"
     } else {
         set display ""
     }
@@ -111,14 +111,14 @@
 	[ad_decode $approved_p \
             "t" "<font color=green>approved</font> 
                 \[<font size=-1>
-                 <a href=admin/approve-or-reject?action=reject&[export_url_vars revision_id return_url]>reject</a></font>\]" \
+                 <a href=admin/approve-or-reject?action=reject&[export_vars -url {revision_id return_url}]>reject</a></font>\]" \
             "f" "<font color=red>rejected</font>
                 \[<font size=-1>
-                 <a href=admin/approve-or-reject?action=approve&[export_url_vars revision_id return_url]>approve</a>\]" \
+                 <a href=admin/approve-or-reject?action=approve&[export_vars -url {revision_id return_url}]>approve</a>\]" \
                 "pending 
                 \[<font size=-1>
-                 <a href=admin/approve-or-reject?action=approve&[export_url_vars revision_id return_url]>approve</a> |
-                 <a href=admin/approve-or-reject?action=reject&[export_url_vars revision_id return_url]>reject</a></font>\]
+                 <a href=admin/approve-or-reject?action=approve&[export_vars -url {revision_id return_url}]>approve</a> |
+                 <a href=admin/approve-or-reject?action=reject&[export_vars -url {revision_id return_url}]>reject</a></font>\]
 	"]
 	    </td>}]
     }
Index: openacs-4/packages/download/www/admin/report-by-ip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.tcl,v
diff -u -N -r1.7 -r1.7.8.1
--- openacs-4/packages/download/www/admin/report-by-ip.tcl	16 Jan 2003 13:46:20 -0000	1.7
+++ openacs-4/packages/download/www/admin/report-by-ip.tcl	9 Sep 2013 17:34:16 -0000	1.7.8.1
@@ -27,7 +27,7 @@
 set table_def {
     {download_ip "From IP"
                {no_sort}
-               {<td><a href="report-one-ip?[export_url_vars download_ip downloaded]">$download_ip</a></td>}}
+               {<td><a href="report-one-ip?[export_vars -url {download_ip downloaded}]">$download_ip</a></td>}}
     {download_hostname "Hostname" {} {}}
     {num_downloads "# Downloads" {no_sort} {}}
 }
Index: openacs-4/packages/download/www/admin/report-by-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.tcl,v
diff -u -N -r1.7 -r1.7.8.1
--- openacs-4/packages/download/www/admin/report-by-user.tcl	16 Jan 2003 13:46:20 -0000	1.7
+++ openacs-4/packages/download/www/admin/report-by-user.tcl	9 Sep 2013 17:34:16 -0000	1.7.8.1
@@ -27,7 +27,7 @@
 set table_def {
     {user_name "User Name (Last name, first name)"
                {no_sort}
-               {<td><a href="report-one-user?[export_url_vars user_id downloaded]">$user_name</a> (<a href="mailto:$email">$email</a>)</td>}}
+               {<td><a href="report-one-user?[export_vars -url {user_id downloaded}]">$user_name</a> (<a href="mailto:$email">$email</a>)</td>}}
     {num_downloads "# Downloads" {no_sort} {}}
 }
 
Index: openacs-4/packages/download/www/admin/report-one-ip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip.tcl,v
diff -u -N -r1.6 -r1.6.8.1
--- openacs-4/packages/download/www/admin/report-one-ip.tcl	16 Jan 2003 13:46:20 -0000	1.6
+++ openacs-4/packages/download/www/admin/report-one-ip.tcl	9 Sep 2013 17:34:16 -0000	1.6.8.1
@@ -38,7 +38,7 @@
     {<td><a href="../one-revision?revision_id=$revision_id">$version_name</a></td>}}
     {user_name "User Name"
     {user_name}
-    {<td><a href="report-one-user?[export_url_vars user_id downloaded]">$user_name</a></td>}}
+    {<td><a href="report-one-user?[export_vars -url {user_id downloaded}]">$user_name</a></td>}}
     {download_date "Download Date"
     {download_date}
     {}}
Index: openacs-4/packages/download/www/admin/report-one-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.tcl,v
diff -u -N -r1.6 -r1.6.8.1
--- openacs-4/packages/download/www/admin/report-one-user.tcl	16 Jan 2003 13:46:20 -0000	1.6
+++ openacs-4/packages/download/www/admin/report-one-user.tcl	9 Sep 2013 17:34:17 -0000	1.6.8.1
@@ -39,7 +39,7 @@
         {}}
     {download_ip "From IP"
         {download_ip}
-        {<td><a href=report-one-ip?[export_url_vars download_ip downloaded]>$download_ip</a> ($download_hostname)</td>}}
+        {<td><a href=report-one-ip?[export_vars -url {download_ip downloaded}]>$download_ip</a> ($download_hostname)</td>}}
     {reason "Download Reason"
         {reason}
         {}}
Index: openacs-4/packages/download/www/admin/report-version-downloads.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.tcl,v
diff -u -N -r1.6.8.1 -r1.6.8.2
--- openacs-4/packages/download/www/admin/report-version-downloads.tcl	6 Sep 2013 16:36:34 -0000	1.6.8.1
+++ openacs-4/packages/download/www/admin/report-version-downloads.tcl	9 Sep 2013 17:34:17 -0000	1.6.8.2
@@ -43,13 +43,13 @@
         {<td><a href="report-one-user?user_id=$user_id">$user_name</a></td>}}
     {version_name "Version"
         {version_name $order}
-        {<td><a href="[ad_conn package_url]one-revision?[export_url_vars revision_id downloaded]">$version_name</a></td>}}
+        {<td><a href="[ad_conn package_url]one-revision?[export_vars -url {revision_id downloaded}]">$version_name</a></td>}}
     {download_date "Download Date"
         {download_date $order}
         {}}
     {download_ip "From IP (hostname)"
         {download_ip $order}
-        {<td><a href="report-one-ip?[export_url_vars download_ip downloaded]">$download_ip</a> ($download_hostname)</td>}}
+        {<td><a href="report-one-ip?[export_vars -url {download_ip downloaded}]">$download_ip</a> ($download_hostname)</td>}}
     {reason "Download Reason"
         {reason $order}
         {<td>$reason</td>}}