Index: branches/5.1.x/units/order_items/order_items_tag_processor.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 13100)
+++ branches/5.1.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_tag_processor.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: order_items_tag_processor.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -212,11 +212,13 @@
 		$product_object =& $this->Application->recallObject('p', 'p', Array('skip_autoload' => true));
 		/* @var $product_object kCatDBItem */
 
-		$product_id = $product_object->GetID();
+		$product_id = $product_object->GetID();		
+		$product_id_get = $this->Application->GetVar('p_id');
 
 		while (!$list->EOL()) {
 			// load product used in orderitem
 			$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
+			$this->Application->SetVar('p_id', $list->GetDBField('ProductId'));
 			$product_object->Load( $list->GetDBField('ProductId') );	// correct product load
 
 			$this->Application->SetVar('m_cat_id', $product_object->GetDBField('CategoryId'));
@@ -226,6 +228,7 @@
 		}
 
 		// restore IDs used in cycle
+		$this->Application->SetVar('p_id', $product_id_get);
 		$this->Application->DeleteVar($this->getPrefixSpecial().'_id');
 		$product_object->Load($product_id);