From 91aaafb01efb366213cd46cd61b9e70f46586a21 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 24 Feb 2012 09:17:10 -0500
Subject: [PATCH] Fixed: FS#2057 - Webdav User Password can't contain special chars
---
server/lib/classes/modules.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index 8c86097..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'])) {
--
Gitblit v1.9.1