From dc7d3a9c924b90f0ea433f54e22583eeccce9c17 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 12 Aug 2015 13:40:17 +0200
Subject: [PATCH] ServicestatusQuery: Respect an already set group clause

refs #7344
---
 .../Backend/Ido/Query/ServicestatusQuery.php           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index e04cabfda..ce988e944 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -362,9 +362,15 @@ class ServicestatusQuery extends IdoQuery
      */
     public function getGroup()
     {
-        $group = array();
+        $group = parent::getGroup() ?: array();
+        if (! is_array($group)) {
+            $group = array($group);
+        }
+
         if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
-            $group = array('s.service_id', 'so.object_id');
+            $group[] = 's.service_id';
+            $group[] = 'so.object_id';
+
             if ($this->hasJoinedVirtualTable('hosts')) {
                 $group[] = 'h.host_id';
             }