From b5a0dc34a3bebd221fe8a564595d4c644122e11d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Dec 2010 17:21:13 -0500
Subject: [PATCH] Merged revisions 2144-2150 from stable branch.
---
server/mods-available/remoteaction_core_module.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index fa51db1..4416bd8 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -150,6 +150,10 @@
}
private function _doIspCUpdate($action) {
+
+ // Ensure that this code is not executed twice as this would cause a loop in case of a failure
+ $this->_actionDone($action['action_id'], 'ok');
+
/*
* Get the version-number of the newest version
*/
@@ -195,7 +199,7 @@
/*
* All well done!
*/
- $this->_actionDone($action['action_id'], 'ok');
+ //$this->_actionDone($action['action_id'], 'ok');
}
}
?>
\ No newline at end of file
--
Gitblit v1.9.1