From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
server/lib/classes/modules.inc.php | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index fff4928..7c579bc 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 {
@@ -98,12 +98,14 @@
$data = unserialize($d['data']);
}
//** Decode data back to locale
+ /*
foreach($data['old'] as $key => $val) {
$data['old'][$key] = utf8_decode($val);
}
foreach($data['new'] as $key => $val) {
$data['new'][$key] = utf8_decode($val);
}
+ */
$replication_error = false;
@@ -206,12 +208,14 @@
$data = unserialize($d['data']);
}
//** decode data back to current locale
+ /*
foreach($data['old'] as $key => $val) {
$data['old'][$key] = utf8_decode($val);
}
foreach($data['new'] as $key => $val) {
$data['new'][$key] = utf8_decode($val);
}
+ */
$this->current_datalog_id = $d['datalog_id'];
if(is_array($data['old']) || is_array($data['new'])) {
@@ -243,9 +247,10 @@
foreach($hooks as $hook) {
$module_name = $hook['module'];
$function_name = $hook['function'];
- // Claa the processing function of the module
+ // Call the processing function of the module
if($this->debug) $app->log("Call function '$function_name' in module '$module_name' raised by TableHook '$table_name'.",LOGLEVEL_DEBUG);
- call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
+ // call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
+ call_user_func(array($app->loaded_modules[$module_name],$function_name),$table_name,$action,$data);
unset($module_name);
unset($function_name);
}
--
Gitblit v1.9.1