Commit e149be29 authored by Till Brehm's avatar Till Brehm

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

Wrong table used to remove deleted backup record for website. File gets removed …

…but not database record.

See merge request !391
parents c4aba1ae 163fa8ca
...@@ -167,7 +167,7 @@ class backup_plugin { ...@@ -167,7 +167,7 @@ class backup_plugin {
if(file_exists($backup_dir.'/'.$backup['filename']) && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) { if(file_exists($backup_dir.'/'.$backup['filename']) && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
unlink($backup_dir.'/'.$backup['filename']); unlink($backup_dir.'/'.$backup['filename']);
$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?"; $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']); $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);
$app->log('unlink '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG); $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