From 132a730d7133793a9c398c708ba6d1968d058f5e Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 5 Sep 2018 21:46:18 +0200 Subject: [PATCH] Removed last offline duration parentheses if empty (#641) --- CHANGELOG.rst | 1 + src/psm/Module/Server/Controller/AbstractServerController.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c69b5ecf..6ef6f223 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Changelog Not yet released ---------------- +* #640: Removed () after last offline value when the last offline duration is unknown. * #637: Added php extensions to composer required list, spelling fixes in changelog and composer update. * #635: Changed server order on ?&mod=user&action=edit&id=x. * #634: Changed ' to " in sql query, both were used. diff --git a/src/psm/Module/Server/Controller/AbstractServerController.php b/src/psm/Module/Server/Controller/AbstractServerController.php index 0e5d8b4d..53145b66 100644 --- a/src/psm/Module/Server/Controller/AbstractServerController.php +++ b/src/psm/Module/Server/Controller/AbstractServerController.php @@ -107,7 +107,8 @@ abstract class AbstractServerController extends AbstractController { $server['last_online'] = psm_timespan($server['last_online']); $server['last_offline'] = psm_timespan($server['last_offline']); if ($server['last_offline'] != psm_get_lang('system', 'never')) { - $server['last_offline_duration'] = "(".$server['last_offline_duration'].")"; + $server['last_offline_duration'] = is_null($server['last_offline_duration']) ? + null : "(".$server['last_offline_duration'].")"; } $server['last_check'] = psm_timespan($server['last_check']); $server['active'] = psm_get_lang('system', $server['active']);