Index: branches/5.2.x/units/order_items/order_items_tag_processor.php
===================================================================
diff -u -N -r14641 -r15021
--- branches/5.2.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 14641)
+++ branches/5.2.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 15021)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_tag_processor.php 14641 2011-10-05 15:31:23Z alex $
+* @version	$Id: order_items_tag_processor.php 15021 2012-01-09 17:16:07Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -215,11 +215,11 @@
 		$o = '';
 		$list->GoFirst();
 
-		$block_params=$this->prepareTagParams($params);
+		$block_params = $this->prepareTagParams($params);
 		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 		$block_params['pass_params'] = 'true';
 
-		$product_object =& $this->Application->recallObject('p', 'p', Array('skip_autoload' => true));
+		$product_object =& $this->Application->recallObject('p', 'p', Array ('skip_autoload' => true));
 		/* @var $product_object kCatDBItem */
 
 		$i = 0;
@@ -228,24 +228,27 @@
 
 		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($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
+			$product_object->Load($list->GetDBField('ProductId')); // correct product load
 
 			$this->Application->SetVar('m_cat_id', $product_object->GetDBField('CategoryId'));
 
 			$block_params['is_last'] = ($i == $list->GetSelectedCount() - 1);
 
-			$o.= $this->Application->ParseBlock($block_params, 1);
+			$o .= $this->Application->ParseBlock($block_params, 1);
 			$list->GoNext();
 			$i++;
 		}
 
 		// restore IDs used in cycle
 		$this->Application->SetVar('p_id', $product_id_get);
-		$this->Application->DeleteVar($this->getPrefixSpecial().'_id');
-		$product_object->Load($product_id);
+		$this->Application->DeleteVar($this->getPrefixSpecial() . '_id');
 
+		if ( $product_id ) {
+			$product_object->Load($product_id);
+		}
+
 		return $o;
 	}