Index: branches/5.1.x/units/orders/orders_event_handler.php
===================================================================
diff -u -r13566 -r13578
--- branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13566)
+++ branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13578)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 13566 2010-05-18 15:17:11Z alex $
+* @version	$Id: orders_event_handler.php 13578 2010-05-19 07:25:51Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1099,7 +1099,7 @@
 		// get user
 		$user_id = $this->Application->RecallVar('user_id');
 		if (!$user_id) {
-			$user_id = -2; // Guest
+			$user_id = USER_GUEST;
 		}
 		$object->SetDBField('PortalUserId', $user_id);
 
@@ -1243,7 +1243,10 @@
 		$ses_user = $this->Application->RecallVar('user_id');
 
 		if ($order->GetDBField('PortalUserId') != $ses_user) {
-			if ($ses_user == 0) $ses_user = -2; //Guest
+			if ($ses_user == 0) {
+				$ses_user = USER_GUEST;
+			}
+
 			$order->SetDBField('PortalUserId', $ses_user);
 			// since CheckUser is called in OnBeforeItemUpdate, we don't need to call udpate here, just set the field
 		}