Index: branches/5.2.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r15049 -r15112
--- branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 15049)
+++ branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 15112)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: admin_events_handler.php 15112 2012-02-16 09:41:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1036,16 +1036,20 @@
 	 */
 	protected function OnDeploy(kEvent &$event)
 	{
-		if ( isset($GLOBALS['argv']) ) {
-			// command line invocation -> don't perform redirect
-			$event->status = kEvent::erSTOP;
-		}
-
 		$deployment_helper =& $this->Application->recallObject('DeploymentHelper');
 		/* @var $deployment_helper DeploymentHelper */
 
 		$deployment_helper->deployAll();
 
+		if ( $deployment_helper->isCommandLine ) {
+			// command line invocation -> don't render template
+			$event->status = kEvent::erSTOP;
+		}
+		else {
+			// browser invocation -> don't perform redirect
+			$event->redirect = false;
+		}
+
 		$event->SetRedirectParam('action_completed', 1);
 	}
 
@@ -1061,11 +1065,17 @@
 		$deployment_helper =& $this->Application->recallObject('DeploymentHelper');
 		/* @var $deployment_helper DeploymentHelper */
 
-		if ( !$deployment_helper->deployAll(true) ) {
-			$event->status = kEvent::erFAIL;
+		if ( $deployment_helper->deployAll(true) ) {
+			$this->Application->SetVar('action_completed', 1);
 		}
+
+		if ( $deployment_helper->isCommandLine ) {
+			// command line invocation -> don't render template
+			$event->status = kEvent::erSTOP;
+		}
 		else {
-			$event->SetRedirectParam('action_completed', 1);
+			// browser invocation -> don't perform redirect
+			$event->redirect = false;
 		}
 	}