Merge pull request #11993 from jaapjansma/issue_66

[civicrm-core.git] / api / v3 / Group.php

diff --git a/api/v3/Group.php b/api/v3/Group.php
index ab60db909c98d3e57289e0d8e50a7f7feaae11e6..a18c50968fdc66a502d0d35510d63288d621e27a 100644 (file)
--- a/api/v3/Group.php
+++ b/api/v3/Group.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
@@ -71,8 +71,10 @@ function _civicrm_api3_group_create_spec(&$params) {
  */
 function civicrm_api3_group_get($params) {
   $options = _civicrm_api3_get_options_from_params($params, TRUE, 'Group', 'get');
-  if ((empty($options['return']) || !in_array('member_count', $options['return'])) && empty($params['check_permissions'])) {
-    return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, TRUE, 'Group');
+
+  if ($options['is_count']) {
+    $params['options']['is_count'] = 0;
+    $params['return'] = 'id';
   }
 
   $groups = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE, 'Group');
@@ -80,7 +82,7 @@ function civicrm_api3_group_get($params) {
     if (!empty($params['check_permissions']) && !CRM_Contact_BAO_Group::checkPermission($group['id'])) {
       unset($groups[$id]);
     }
-    elseif (!empty($options['return']) && in_array('member_count', $options['return'])) {
+    if (!empty($options['return']) && in_array('member_count', $options['return'])) {
       $groups[$id]['member_count'] = CRM_Contact_BAO_Group::memberCount($id);
     }
   }
@@ -93,7 +95,6 @@ function civicrm_api3_group_get($params) {
  * @param array $params
  *   [id]
  * @return array API result array
- * API result array
  * @throws API_Exception
  */
 function civicrm_api3_group_delete($params) {