Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15018 -r15025
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15018)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15025)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15018 2012-01-09 11:41:23Z alex $
+* @version	$Id: orders_event_handler.php 15025 2012-01-10 08:57:44Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1083,7 +1083,8 @@
 
 		if ($result) {
 			$event->status = kEvent::erSUCCESS;
-			$event->redirect = $this->Application->isAdminUser ? true : $this->Application->GetVar('shop_cart_template');
+			$shop_cart_template = $this->Application->GetVar('shop_cart_template');
+			$event->redirect = $this->Application->isAdminUser || !$shop_cart_template ? true : $shop_cart_template;
 		}
 		else {
 			$event->status = kEvent::erFAIL;
@@ -1301,8 +1302,12 @@
 		$event->setEventParam('ItemData', serialize($item_data));
 		$this->AddItemToOrder($event, $item_id);
 
-		$event->redirect = $this->Application->GetVar('shop_cart_template');
+		$shop_cart_template = $this->Application->GetVar('shop_cart_template');
 
+		if ( $shop_cart_template ) {
+			$event->redirect = $shop_cart_template;
+		}
+
 		// don't pass unused info to shopping cart, brokes old mod-rewrites
 		$event->SetRedirectParam('pass', 'm'); // not to pass link id
 		$event->SetRedirectParam('m_cat_id', 0); // not to pass link id