Index: branches/5.1.x/units/gateways/gw_classes/paypal_direct.php
===================================================================
diff -u -r13100 -r13465
--- branches/5.1.x/units/gateways/gw_classes/paypal_direct.php	(.../paypal_direct.php)	(revision 13100)
+++ branches/5.1.x/units/gateways/gw_classes/paypal_direct.php	(.../paypal_direct.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: paypal_direct.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: paypal_direct.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -76,8 +76,11 @@
 			$post_fields['STREET2']				=	$item_data['BillingAddress2'];
 			$post_fields['CITY']				=	$item_data['BillingCity'];
 			$post_fields['STATE']				=	$item_data['BillingState'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$post_fields['COUNTRYCODE']			=	$this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
+
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			$post_fields['COUNTRYCODE']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$post_fields['ZIP']					=	$item_data['BillingZip'];
 			$post_fields['INVNUM']				=	$item_data['OrderNumber'];
 			$post_fields['CUSTOM']				=	$item_data['PortalUserId'];
@@ -115,8 +118,7 @@
 			}
 			$post_fields['x_email'] = $billing_email;
 			$post_fields['x_phone'] = $item_data['BillingPhone'];
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = %s';
-			$post_fields['x_country']			=	$this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($item_data['BillingCountry']) ) );
+			$post_fields['x_country']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
 
 			$post_fields['x_cust_id']			=	$item_data['PortalUserId'];
 			$post_fields['x_invoice_num']		=	$item_data['OrderNumber'];