Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15213 -r15540
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15213)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15540)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15213 2012-03-15 09:32:42Z alex $
+* @version	$Id: orders_event_handler.php 15540 2012-09-14 15:37:53Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -54,7 +54,8 @@
 						return false;
 					}
 
-					$status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField'));
+					$status_field = $order_dummy->getStatusField();
+
 					if ( isset($field_values[$status_field]) && $order_dummy->GetDBField($status_field) != $field_values[$status_field] ) {
 						// user can't change status by himself
 						return false;
@@ -3389,7 +3390,7 @@
 	 */
 	function OnGoToOrder($event)
 	{
-		$id = array_shift( $this->StoreSelectedIDs($event) );
+		$id = current($this->StoreSelectedIDs($event));
 
 		$id_field = $this->Application->getUnitOption($event->Prefix,'IDField');
 		$table = $this->Application->getUnitOption($event->Prefix,'TableName');