Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

Till Brehm · Till Brehm · commit bb36ff28689f · 2014-05-21T14:17:12.000+02:00
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
@@ -75,10 +75,10 @@ public function backup_action($action_name, $data) {
 			$backup_dir_is_ready = true;
 			$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
 			if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
-				if(!$app->system->is_mounted($backup_dir)){
+				if(!$app->system->is_mounted($server_config['backup_dir'])){
 					exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
 					sleep(1);
-					if(!$app->system->is_mounted($backup_dir)) $backup_dir_is_ready = false;
+					if(!$app->system->is_mounted($server_config['backup_dir'])) $backup_dir_is_ready = false;
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,10 @@ public function backup_action($action_name, $data) {`
`75`	`75`	`$backup_dir_is_ready = true;`
`76`	`76`	`$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);`
`77`	`77`	`if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){`
`78`		`- if(!$app->system->is_mounted($backup_dir)){`
	`78`	`+ if(!$app->system->is_mounted($server_config['backup_dir'])){`
`79`	`79`	`exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));`
`80`	`80`	`sleep(1);`
`81`		`- if(!$app->system->is_mounted($backup_dir)) $backup_dir_is_ready = false;`
	`81`	`+ if(!$app->system->is_mounted($server_config['backup_dir'])) $backup_dir_is_ready = false;`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`