Commit 5a03084f authored by Till Brehm's avatar Till Brehm

Merge branch 'patch-1' into 'stable-3.1'

Fix bug where in a multiserver setup, deleting a backup will not remove its…

See merge request ispconfig/ispconfig3!736
parents 56fd8f66 66e7e7b9
......@@ -170,7 +170,7 @@ class backup_plugin {
$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
$app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
$app->log('unlink '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment