Commit 3f246226 authored by Alexandre Morin's avatar Alexandre Morin
Browse files

Merge branch 'hotfix/2.3.11' into 'Support/2.3.X'

Hotfix/2.3.11

See merge request !250
parents dddbf637 b4da36a7
...@@ -315,11 +315,21 @@ class scheduling ...@@ -315,11 +315,21 @@ class scheduling
* Thursday 18h -> 20h every 5 Minutes * Thursday 18h -> 20h every 5 Minutes
*/ */
if(!empty($frequency[1])) { if (!empty($frequency[1])) {
$frequency[1] -= $H_Offset; $frequency[1] -= $H_Offset;
} }
if(!empty($frequency[8] && $frequency[8] != "00")) { if (!empty($frequency[8] && $frequency[8] != "00")) {
$frequency[8] -= $H_Offset; $frequency[8] -= $H_Offset;
}
if ($frequency[1] < 0) {
$frequency[1] = 24 + $frequency[1];
} elseif ($frequency[1] >= 24) {
$frequency[1] = $frequency[1] - 24;
}
if ($frequency[8] < 0) {
$frequency[8] = 24 + $frequency[8];
} elseif ($frequency[8] >= 24) {
$frequency[8] = $frequency[8] - 24;
} }
if ($frequency[6] != "") { if ($frequency[6] != "") {
......
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
500: function() { 500: function() {
gritter.show($('#executionError').text(), false); gritter.show($('#executionError').text(), false);
} }
} }
return $.ajax(request); return $.ajax(request);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment