Index: branches/5.2.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -N -r15568 -r15854
--- branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 15568)
+++ branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 15854)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: usps.php 15568 2012-10-10 13:27:55Z alex $
+* @version	$Id: usps.php 15854 2013-07-02 14:55:29Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -734,7 +734,7 @@
 			            '</IntlRateRequest>';
 			$api_query = 'IntlRate';
 		}
-		$request = 'API='.$api_query.'&XML=' . urlencode($request);
+		$request = 'API='.$api_query.'&XML=' . kUtil::escape($request, kUtil::ESCAPE_URL);
 		$body = $this->PostQuery($request);
 		$body = str_replace(chr(146), '', $body); // for bad `
 
@@ -937,7 +937,7 @@
 
 		// die($request);
 
-		$request = 'API='.$api_query.'&XML='.urlencode($request);
+		$request = 'API='.$api_query.'&XML='.kUtil::escape($request, kUtil::ESCAPE_URL);
 
 		$body = $this->PostQuery($request, 1);
 
@@ -1079,7 +1079,7 @@
 
 			$request = '<TrackRequest USERID="'.$this->usps_userid.'"><TrackID ID="'.$TrackingNumber.'"></TrackID></TrackRequest>';
 			$api_query = 'TrackV2';
-			$request = 'API='.$api_query.'&XML='.urlencode($request);
+			$request = 'API='.$api_query.'&XML='.kUtil::escape($request, kUtil::ESCAPE_URL);
 			$body = $this->PostQuery($request);
 
 			// check for errors