Index: branches/5.0.x/units/orders/orders_event_handler.php
===================================================================
diff -u -r13532 -r13589
--- branches/5.0.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13532)
+++ branches/5.0.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13589)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 13532 2010-05-11 09:07:25Z alex $
+* @version	$Id: orders_event_handler.php 13589 2010-05-19 17:50:52Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1058,7 +1058,9 @@
 
 		if ($event->Special == 'last') {
 			// return last order id (for using on thank you page)
-			return $this->Application->RecallVar('front_order_id');
+			$order_id = $this->Application->RecallVar('front_order_id');
+
+			return $order_id > 0 ? $order_id : FAKE_ORDER_ID; // FAKE_ORDER_ID helps to keep parent filter for order items set in "kDBList::linkToParent"
 		}
 
 		$ses_id = $this->Application->RecallVar( $event->getPrefixSpecial(true) . '_id' );