From 361afdcf13fe488c0d42cb63fb2883b7becc2710 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 11 Mar 2015 14:08:43 +0100 Subject: [PATCH] Use ! empty in favor of count > 0 in the MonitoredObjectController refs #8614 --- .../Controller/MonitoredObjectController.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php index 1b8fd2336..04102e9d2 100644 --- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php +++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php @@ -74,26 +74,26 @@ abstract class MonitoredObjectController extends Controller } } $this->object->populate(); - if (count($this->object->comments) > 0 && $auth->hasPermission('monitoring/command/comment/delete')) { - $delCommentForm = new DeleteCommentCommandForm(); - $delCommentForm - ->setObjects($this->object) - ->handleRequest(); - $this->view->delCommentForm = $delCommentForm; - } - if (count($this->object->downtimes > 0) && $auth->hasPermission('monitoring/command/downtime/delete')) { - $delDowntimeForm = new DeleteDowntimeCommandForm(); - $delDowntimeForm - ->setObjects($this->object) - ->handleRequest(); - $this->view->delDowntimeForm = $delDowntimeForm; - } $toggleFeaturesForm = new ToggleObjectFeaturesCommandForm(); $toggleFeaturesForm ->load($this->object) ->setObjects($this->object) ->handleRequest(); $this->view->toggleFeaturesForm = $toggleFeaturesForm; + if (! empty($this->object->comments) && $auth->hasPermission('monitoring/command/comment/delete')) { + $delCommentForm = new DeleteCommentCommandForm(); + $delCommentForm + ->setObjects($this->object) + ->handleRequest(); + $this->view->delCommentForm = $delCommentForm; + } + if (! empty($this->object->downtimes) && $auth->hasPermission('monitoring/command/downtime/delete')) { + $delDowntimeForm = new DeleteDowntimeCommandForm(); + $delDowntimeForm + ->setObjects($this->object) + ->handleRequest(); + $this->view->delDowntimeForm = $delDowntimeForm; + } $this->view->object = $this->object; }