From dec0dfa3a81e23a5a123be56ae8b36e0f1ed9137 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 22 Feb 2012 09:47:32 -0500
Subject: [PATCH] Merged revisions 2916-2941 from stable branch.
---
server/lib/classes/modules.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index ef600bd..143683d 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -83,7 +83,7 @@
global $app,$conf;
//* If its a multiserver setup
- if($app->db->dbHost != $app->dbmaster->dbHost) {
+ if($app->db->dbHost != $app->dbmaster->dbHost || ($app->db->dbHost == $app->dbmaster->dbHost && $app->db->dbName != $app->dbmaster->dbName)) {
if($conf['mirror_server_id'] > 0) {
$sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf['server_id']." OR server_id = ".$conf['mirror_server_id']." OR server_id = 0) ORDER BY datalog_id";
} else {
--
Gitblit v1.9.1