From 8ddcb0d7ac2141b934c789cd7b5cf06f05e730b0 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Tue, 18 Feb 2014 09:27:43 -0500 Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5' --- server/plugins-available/cron_plugin.inc.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php index d02b1fd..b37c8ed 100644 --- a/server/plugins-available/cron_plugin.inc.php +++ b/server/plugins-available/cron_plugin.inc.php @@ -232,7 +232,11 @@ $command .= "\t"; if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/'; +<<<<<<< HEAD $command .= $job['command'] . " " . $log_target; +======= + $command .= $job['command']; +>>>>>>> origin/stable-3.0.5 } if($job['type'] == 'chrooted') { -- Gitblit v1.9.1