From 842b5c34e70869b7b1a0d368cbb6280f737301d3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 04 Sep 2015 08:56:46 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/plugins-available/backup_plugin.inc.php | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index cb9911d..50fa81c 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -71,7 +71,9 @@
$web = $app->dbmaster->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
- $backup_dir = $server_config['backup_dir'].'/web'.$web['domain_id'];
+ $backup_dir = trim($server_config['backup_dir']);
+ if($backup_dir == '') return;
+ $backup_dir .= '/web'.$web['domain_id'];
$backup_dir_is_ready = true;
//* mount backup directory, if necessary
@@ -178,7 +180,10 @@
$app->uses('ini_parser,file,getconf');
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
- $backup_dir = $server_config['backup_dir'];
+ $backup_dir = trim($server_config['backup_dir']);
+
+ if($backup_dir == '') return;
+
$backup_dir_is_ready = true;
//* mount backup directory, if necessary
--
Gitblit v1.9.1