Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r14729 -r14796
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14729)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14796)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 14729 2011-11-03 11:05:14Z alex $
+* @version	$Id: orders_event_handler.php 14796 2011-11-24 16:39:35Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -259,7 +259,7 @@
 		}
 
 		$ses_id = $this->Application->RecallVar('ord_id');
-		
+
 		if ( $ses_id ) {
 			$this->updateUserID($ses_id, $event);
 		}
@@ -529,15 +529,12 @@
 
 	function OnContinueShopping(&$event)
 	{
-		$env = $this->Application->GetVar('continue_shopping_template');
-		if (!$env || $env == '__default__') {
-			$env = $this->Application->RecallVar('continue_shopping');
-		}
-		if (!$env) {
-			$env = 'in-commerce/index';
-		}
+		$order_helper =& $this->Application->recallObject('OrderHelper');
+		/* @var $order_helper OrderHelper */
 
-		$event->redirect = $env;
+		$template = $this->Application->GetVar('continue_shopping_template');
+
+		$event->redirect = $order_helper->getContinueShoppingTemplate($template);
 	}
 
 	/**
Index: branches/5.2.x/units/orders/orders_tag_processor.php
===================================================================
diff -u -N -r14723 -r14796
--- branches/5.2.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 14723)
+++ branches/5.2.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 14796)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_tag_processor.php 14723 2011-11-03 08:41:26Z alex $
+* @version	$Id: orders_tag_processor.php 14796 2011-11-24 16:39:35Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1624,4 +1624,27 @@
 
 			return $o;
 		}
+
+		/**
+		 * Creates a continue shopping link
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access protected
+		 */
+		protected function ContinueShoppingLink($params)
+		{
+			$order_helper =& $this->Application->recallObject('OrderHelper');
+			/* @var $order_helper OrderHelper */
+
+			if ( isset($params['template']) ) {
+				$template = $params['template'];
+				unset($params['template']);
+			}
+			else {
+				$template = '';
+			}
+
+			return $this->Application->HREF($order_helper->getContinueShoppingTemplate($template), '', $params);
+		}
 	}
\ No newline at end of file
Index: branches/5.2.x/units/orders/order_calculator.php
===================================================================
diff -u -N -r14641 -r14796
--- branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 14641)
+++ branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 14796)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version   $Id: order_calculator.php 14641 2011-10-05 15:31:23Z alex $
+* @version   $Id: order_calculator.php 14796 2011-11-24 16:39:35Z alex $
 * @package   In-Commerce
 * @copyright   Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license   Commercial License
@@ -123,7 +123,7 @@
 					$this->items[$group_item_id]['Quantity'] = 0;
 				}
 
-				$items_skipped = array_merge($items_skipped, $group_items);
+				$skipped_items = array_merge($skipped_items, $group_items);
 			}
 		}