Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	11 Aug 2008 07:18:06 -0000	1.5
@@ -20,26 +20,26 @@
 	  <tr bgcolor="#eeeeee">
 	</else>
 	<td>
-	  @addresses.formatted@
+	  @addresses.formatted;noquote@
 	</td>
 	<td>
 	  <table>
 	    <tr>
 	      <td>
 		<form method="post" action="gift-certificate-order-3">
-		  @addresses.use@
+		  @addresses.use;noquote@
 		  <input type="submit" value="Use"></input>
 		</form>
 	      </td>
 	      <td>
 		<form method="post" action="address">
-		  @addresses.edit@
+		  @addresses.edit;noquote@
 		  <input type="submit" value="Edit"></input>
 		</form>
 	      </td>
 	      <td>
 		<form method="post" action="delete-address">
-		  @addresses.delete@
+		  @addresses.delete;noquote@
 		  <input type="submit" value="Delete"></input>
 		</form>
 	      </td>
@@ -60,7 +60,7 @@
     <tr>
       <td>
 	<form method="post" action="address">
-	  @hidden_form_vars@
+	  @hidden_form_vars;noquote@
 	  <input type="submit" value="Enter a new U.S. address">
 	</form>
       </td>
@@ -69,7 +69,7 @@
       </td>
       <td>
 	<form method="post" action="address">
-	  @hidden_form_vars@
+	  @hidden_form_vars;noquote@
 	  <input type="submit" value="Enter a new INTERNATIONAL address">
 	</form>
       </td>
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	11 Aug 2008 07:20:15 -0000	1.5
@@ -7,7 +7,7 @@
   <property name="current_location">gift-certificate</property>
 
 <form method=post action="gift-certificate-order-4">
-  @hidden_form_variables@
+  @hidden_form_variables;noquote@
   <blockquote>
     <table>
       <tr>
@@ -16,11 +16,11 @@
       </tr>
       <tr>
 	<td>Type:</td>
-	<td>@ec_creditcard_widget@</td>
+	<td>@ec_creditcard_widget;noquote@</td>
       </tr>
       <tr>
 	<td>Expires:</td>
-	<td>@ec_expires_widget@</td>
+	<td>@ec_expires_widget;noquote@</td>
       </tr>
     </table>
   </blockquote>
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	11 Aug 2008 07:21:17 -0000	1.5
@@ -8,7 +8,7 @@
 
 <blockquote>
   <form method="post" action="gift-certificate-finalize-order">
-    @hidden_form_variables@
+    @hidden_form_variables;noquote@
     <b>Push Submit to send us your order!</b> <input type="submit" value="Submit">
       <blockquote>
 	<table>
@@ -25,9 +25,9 @@
 	      <font size="+1">Your Gift Certificate Order:</font>
 	    </td>
 	  </tr>
-	  @to_row@
-	  @from_row@
-	  @message_row@
+	  @to_row;noquote@
+	  @from_row;noquote@
+	  @message_row;noquote@
 	  <tr>
 	    <td valign="top">
 	      <b>Will be sent to:</b>
@@ -41,23 +41,23 @@
 	      <b>Subtotal:</b>
 	    </td>
 	    <td>
-	      @formatted_amount@
+	      @formatted_amount;noquote@
 	    </td>
 	  </tr>
 	  <tr>
 	    <td>
 	      <b>Shipping:</b>
 	    </td>
 	    <td>
-	      @zero_in_the_correct_currency@
+	      @zero_in_the_correct_currency;noquote@
 	    </td>
 	  </tr>
 	  <tr>
 	    <td>
 	      <b>Tax:</b>
 	    </td>
 	    <td>
-	      @zero_in_the_correct_currency@
+	      @zero_in_the_correct_currency;noquote@
 	    </td>
 	  </tr>
 	  <tr>
@@ -73,7 +73,7 @@
 	      <b>Total Due:</b>
 	    </td>
 	    <td>
-	      @formatted_amount@
+	      @formatted_amount;noquote@
 	    </td>
 	  </tr>
 	</table>