Index: branches/5.2.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r15683 -r15715 --- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15683) +++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15715) @@ -1,6 +1,6 @@ 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 { + if ( !$deployment_helper->isCommandLine ) { // browser invocation -> don't perform redirect $event->redirect = false; } - $event->SetRedirectParam('action_completed', 1); + if ( $deployment_helper->deployAll() ) { + $event->SetRedirectParam('action_completed', 1); + } + else { + $event->status = kEvent::erFAIL; + } } /** @@ -1073,17 +1072,16 @@ $deployment_helper = $this->Application->recallObject('DeploymentHelper'); /* @var $deployment_helper DeploymentHelper */ + if ( !$deployment_helper->isCommandLine ) { + // browser invocation -> don't perform redirect + $event->redirect = false; + } + 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 { - // browser invocation -> don't perform redirect - $event->redirect = false; + $event->status = kEvent::erFAIL; } }