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/lib/classes/cron.d/500-backup.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/cron.d/500-backup.inc.php b/server/lib/classes/cron.d/500-backup.inc.php
index e196cb5..fcf4095 100644
--- a/server/lib/classes/cron.d/500-backup.inc.php
+++ b/server/lib/classes/cron.d/500-backup.inc.php
@@ -52,7 +52,7 @@
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
$global_config = $app->getconf->get_global_config('sites');
- $backup_dir = $server_config['backup_dir'];
+ $backup_dir = trim($server_config['backup_dir']);
$backup_mode = $server_config['backup_mode'];
if($backup_mode == '') $backup_mode = 'userzip';
--
Gitblit v1.9.1