From 10b4c85a7686da07bddb5779f8ceea48acdf412e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 03 Jan 2013 06:51:45 -0500
Subject: [PATCH] Merged revisons 3687-3748 from 3.0.5 stable branch.
---
server/plugins-available/aps_plugin.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/aps_plugin.inc.php b/server/plugins-available/aps_plugin.inc.php
index badbc0e..dbbbfb9 100644
--- a/server/plugins-available/aps_plugin.inc.php
+++ b/server/plugins-available/aps_plugin.inc.php
@@ -28,7 +28,7 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-if(defined(ISPC_ROOT_PATH)) include_once(ISPC_ROOT_PATH.'/lib/classes/aps_installer.inc.php');
+if(defined('ISPC_ROOT_PATH')) include_once(ISPC_ROOT_PATH.'/lib/classes/aps_installer.inc.php');
//require_once(ISPC_ROOT_PATH.'/lib/classes/class.installer.php');
class aps_plugin
@@ -69,6 +69,10 @@
{
global $app, $conf;
+ //* dont run the installer on a mirror server to prevent
+ // that the pplication gets installed twice.
+ if($conf['mirror_server_id'] > 0) return true;
+
$app->log("Starting APS install",LOGLEVEL_DEBUG);
if(!isset($data['new']['id'])) return false;
$instanceid = $data['new']['id'];
--
Gitblit v1.9.1