From 7cbed050417f967f34340661b7d7a8a7e42e5710 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 26 Feb 2015 06:59:21 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/tools/resync.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index 35279b1..517d048 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -466,7 +466,7 @@
 
 		//* database
 		if(isset($this->dataRecord['resync_db']) && $this->dataRecord['resync_db'] == 1) {
-			$msg .= $this->do_resync('web_database_user', 'database_user_id', 'db', $this->dataRecord['db_server_id'], 'database_user',  $app->tform->wordbook['do_db_user_txt']);
+			$msg .= $this->do_resync('web_database_user', 'database_user_id', 'db', $this->dataRecord['db_server_id'], 'database_user',  $app->tform->wordbook['do_db_user_txt'], false);
 			$msg .= $this->do_resync('web_database', 'database_id', 'db', $this->dataRecord['db_server_id'], 'database_name',  $app->tform->wordbook['do_db_txt']);
 		}
 

--
Gitblit v1.9.1