From 341ef7175af7c8f21d27262b58da8f5bc2c06ef0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:44:59 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'
---
server/plugins-available/cron_plugin.inc.php | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index b37c8ed..a518cac 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -231,12 +231,8 @@
$job['command'] = str_replace('[web_root]', $web_root, $job['command']);
$command .= "\t";
- if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
-<<<<<<< HEAD
+ //if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
$command .= $job['command'] . " " . $log_target;
-=======
- $command .= $job['command'];
->>>>>>> origin/stable-3.0.5
}
if($job['type'] == 'chrooted') {
--
Gitblit v1.9.1