From 6882ab1634ec66e621e8964428f741cd7d103a00 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Dec 2011 05:07:05 -0500
Subject: [PATCH] Merged revisions 2794-2804 from stable branch.

---
 server/mods-available/remoteaction_core_module.inc.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 1f6ab09..49294f4 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -119,12 +119,14 @@
 					* we stop executing the actions not to waste more time */
 					return;
 				}
+				
 				if ($action['action_type'] == 'ispc_update') {
 					/* do the update */
-					$this->_doIspCUpdate($action);
+					// Update function has been removed
+					// $this->_doIspCUpdate($action);
 					/* this action takes so much time,
 					* we stop executing the actions not to waste more time */
-					return;
+					$this->_actionDone($action['action_id'], 'ok');
 				}
 				if ($action['action_type'] == 'openvz_start_vm') {
 					$veid = intval($action['action_param']);

--
Gitblit v1.9.1