Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	26 Sep 2003 08:09:07 -0000	1.45
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	26 Sep 2003 12:51:52 -0000	1.46
@@ -965,7 +965,15 @@
     # Prepend with the base URL
     if { [exists_and_not_null base] } {
         if { ![empty_string_p $export_string] } {
-            set export_string "$base?$export_string"
+            if { [regexp {\?} $base] } {
+                # The base already has query vars
+                set export_string "${base}&${export_string}"
+                ns_log Notice "pm debug with query vars base=$base export_string=$export_string"
+            } else { 
+                # The base has no query vars
+                set export_string "$base?$export_string"
+                ns_log Notice "pm debug without query vars base=$base export_string=$export_string"
+            }
         } else {
             set export_string $base
         }