Index: branches/5.1.x/units/gateways/gw_classes/paypal.php
===================================================================
diff -u -r13100 -r13465
--- branches/5.1.x/units/gateways/gw_classes/paypal.php	(.../paypal.php)	(revision 13100)
+++ branches/5.1.x/units/gateways/gw_classes/paypal.php	(.../paypal.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: paypal.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: paypal.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -80,9 +80,11 @@
 			$ret['city'] = $item_data['BillingCity'];
 			$ret['state'] = $item_data['BillingState'];
 			$ret['zip'] = $item_data['BillingZip'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$ret['country'] = $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$ret['notify_url'] = $this->Application->BaseURL('/in-commerce').'gw_notify.php?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'];
 			$ret['cmd'] = '_xclick'; // act as "Buy Now" PayPal button
 			return $ret;
@@ -142,9 +144,11 @@
 			$ret['city'] = $item_data['BillingCity'];
 			$ret['state'] = $item_data['BillingState'];
 			$ret['zip'] = $item_data['BillingZip'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$ret['country'] = $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
 
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$ret['notify_url'] = $this->Application->BaseURL('/in-commerce').'gw_notify.php?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'].'&payment_type_id='.$tag_params['payment_type_id'];
 			$ret['cmd'] = '_xclick-subscriptions'; // act as "Buy Now" PayPal button