github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 18:49:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolving repo conflicts

Browse source
This commit is contained in:
Serghey Rodin 2016-06-25 11:07:06 +03:00
commit 704bf770f7
9 changed files with 963 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

3
web/edit/cron/index.php
View file

@ -22,7 +22,8 @@ if (empty($_GET['job'])) {
$v_job = escapeshellarg($_GET['job']);
exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var);
check_return_code($return_var,$output);
$data = json_decode(implode('', $output), true);
$data = json_decode(implode('', str_replace("\\", "\\\\", $output)), true);
unset($output);
// Parse cron job