Merge branch 'master' into 'master'

Marius Cramer · Marius Cramer · commit 7cbed050417f · 2015-02-26T12:59:21.000+01:00
Master

See merge request !168
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
@@ -466,7 +466,7 @@ function onSubmit() {
 
 		//* 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']);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ function onSubmit() {`
`466`	`466`
`467`	`467`	`//* database`
`468`	`468`	`if(isset($this->dataRecord['resync_db']) && $this->dataRecord['resync_db'] == 1) {`
`469`		`- $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']);`
	`469`	`+ $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);`
`470`	`470`	`$msg .= $this->do_resync('web_database', 'database_id', 'db', $this->dataRecord['db_server_id'], 'database_name', $app->tform->wordbook['do_db_txt']);`
`471`	`471`	`}`
`472`	`472`