Commit e84d0e66 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #741 PHP errors in support Daemon

Showing with 3 additions and 2 deletions
+3 -2
...@@ -133,7 +133,9 @@ class supportDaemon ...@@ -133,7 +133,9 @@ class supportDaemon
timezone::get_default_timezone(); timezone::get_default_timezone();
if($event->get_timestamp(FALSE) != 0) { if($event->get_timestamp(FALSE) != 0) {
$data_json['timestamp'] = $event->get_timestamp(FALSE); $data_json['timestamp'] = $event->get_timestamp(FALSE);
$data_json['periodic'] = $data['periodic']; if(isset($data['periodic'])) {
$data_json['periodic'] = $data['periodic'];
}
} }
$data_json['args'] = $data; $data_json['args'] = $data;
unset($data_json['args']['timestamp']); unset($data_json['args']['timestamp']);
...@@ -259,7 +261,6 @@ class supportDaemon ...@@ -259,7 +261,6 @@ class supportDaemon
$this->set_error(nl2br($e->getMessage())); $this->set_error(nl2br($e->getMessage()));
return(FALSE); return(FALSE);
} }
$this->get_entries();
$entries = $this->format_entries($entries); $entries = $this->format_entries($entries);
$this->reset_error(); $this->reset_error();
return($entries); return($entries);
......
  • bmortier @bmortier

    mentioned in issue #286

    By Côme Chilliet on 2017-09-02T14:41:54 (imported from GitLab)

    ·

    mentioned in issue #286

    By Côme Chilliet on 2017-09-02T14:41:54 (imported from GitLab)

    Toggle commit list
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