Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15540 -r15568
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15540)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15540 2012-09-14 15:37:53Z alex $
+* @version	$Id: orders_event_handler.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1610,7 +1610,7 @@
 
 		$this->setNextOrderNumber($event);
 
-		$object->SetDBField('OrderIP', $_SERVER['REMOTE_ADDR']);
+		$object->SetDBField('OrderIP', $this->Application->getClientIp());
 
 		$order_type = $this->getTypeBySpecial( $this->Application->GetVar('order_type') );
 		$object->SetDBField('Status', $order_type);
@@ -2427,7 +2427,7 @@
 		$this->CheckUser($event);
 
 		if ( !$object->GetDBField('OrderIP') ) {
-			$object->SetDBField('OrderIP', $_SERVER['REMOTE_ADDR']);
+			$object->SetDBField('OrderIP', $this->Application->getClientIp());
 		}
 
 		$shipping_option = $this->Application->GetVar('OriginalShippingOption');