MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [internal] Don't try to convert shorthand time notations to timestamp if the data is already in timestamp format

pull/3433/head
iglocska 2018-07-04 15:32:59 +02:00
parent ce6890081a
commit 2b3422d4e2
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/Event.php
View File

@ -3450,6 +3450,7 @@ class Event extends AppModel {
}
public function resolveTimeDelta($delta) {
if (is_int($delta)) return $delta;
$multiplierArray = array('d' => 86400, 'h' => 3600, 'm' => 60);
$multiplier = $multiplierArray['d'];
$lastChar = strtolower(substr($delta, -1));