Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r14702 -r14729
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14702)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14729)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 14702 2011-10-26 11:43:10Z alex $
+* @version	$Id: orders_event_handler.php 14729 2011-11-03 11:05:14Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -245,24 +245,32 @@
 	}
 
 	/**
-	 * Enter description here...
+	 * Updates shopping cart with logged-in user details
 	 *
-	 * @param unknown_type $event
-	 * @return unknown
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnUserLogin(&$event)
+	protected function OnUserLogin(&$event)
 	{
-		if( !($event->MasterEvent->status == kEvent::erSUCCESS) ) {
-			return false;
+		if ( ($event->MasterEvent->status != kEvent::erSUCCESS) || kUtil::constOn('IS_INSTALL') ) {
+			// login failed OR login during installation
+			return;
 		}
 
 		$ses_id = $this->Application->RecallVar('ord_id');
-		if ($ses_id) $this->updateUserID($ses_id, $event);
+		
+		if ( $ses_id ) {
+			$this->updateUserID($ses_id, $event);
+		}
 
 		$user_id = $this->Application->RecallVar('user_id');
 		$affiliate_id = $this->isAffiliate($user_id);
-		if($affiliate_id) $this->Application->setVisitField('AffiliateId', $affiliate_id);
 
+		if ( $affiliate_id ) {
+			$this->Application->setVisitField('AffiliateId', $affiliate_id);
+		}
+
 		$event->CallSubEvent('OnRecalculateItems');
 	}