From af425a68a3e7cd50af4444bd9e798d75ac49c92c Mon Sep 17 00:00:00 2001 From: Karsten Heiken Date: Sun, 16 Oct 2011 15:38:30 +0200 Subject: [PATCH] If there was no heartbeat yet, don't calculate the time since 1970 --- application/models/server.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/models/server.php b/application/models/server.php index 913d9ab..de34e6b 100644 --- a/application/models/server.php +++ b/application/models/server.php @@ -112,7 +112,11 @@ class Server extends CI_Model { $server = $this->db->get_where('servers', array('id' => $serverId))->row(); if (is_object($server)) { $server->uptimestring = prettyTime($server->uptime); - $server->lastheartbeat = prettyTime(time_diff($server->last_update, mysql_now())); + if($server->last_update == 0) { + $server->lastheartbeat = _("No heartbeat received yet."); + } else { + $server->lastheartbeat = prettyTime(time_diff($server->last_update, mysql_now())); + } } return $server; }