Merge pull request #514 from GinkgoFJG/civicrm_group_roles-d6-fix-wro…

…ng-api-entity Backport fix from D7 module.
civicrm · Feb 10, 2018 · 1cfcb49 · 1cfcb49
2 parents 8c82cce + 3e61d55
commit 1cfcb49
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/modules/civicrm_group_roles/civicrm_group_roles.module b/modules/civicrm_group_roles/civicrm_group_roles.module
@@ -330,13 +330,11 @@ function civicrm_group_roles_show_rules($action = NULL, $id = NULL) {
   $roles = user_roles(TRUE);
 
   // get civicrm groups
-  $params = array(
-    'version' => '3',
-    'option.limit' => 0,
-  );
+  $params = array('version' => 3, 'option.limit' => 0);
+
+  $groups = civicrm_api('group', 'get', $params);
+  $groups = CRM_Utils_Array::value('values', $groups, array());
 
-  $groups = civicrm_api('group_contact','get',$params);
-  $groups = $groups['values'];
   //Begin building main output table.
   $header = array(t('Rule ID'), t('Rule Name (\'CiviCRM Group\' <--> \'Drupal Role\')'), t('Operation'));
   $data = array();