- Minor fix in multigroup. Remove the check for module_exists('fieldgroup'), which...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8ca6753..e985a9c 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -43,6 +43,7 @@ Bugfixes:
 - #538872 Diff does not respect field permissions.
 - #522558 Date field jumps delta when date field is emptied or fieldset is deleted.
 - #416134 Userreference, impossible to filter allowed values by blocked users. Requires update.php.
+- Minor fix in multigroup. Remove the check for module_exists('fieldgroup'), which is something implicit.
 
 Changes:
 - #421116 Move content.js to js/content.admin.js for consistency with location of new js files.

diff --git a/modules/content_multigroup/content_multigroup.admin.inc b/modules/content_multigroup/content_multigroup.admin.inc
index f9cb593..805660c 100644 (file)
--- a/modules/content_multigroup/content_multigroup.admin.inc
+++ b/modules/content_multigroup/content_multigroup.admin.inc
@@ -234,10 +234,6 @@ function content_multigroup_display_overview_form(&$form, &$form_state) {
     return;
   }
 
-  $groups = array();
-  if (module_exists('fieldgroup')) {
-    $groups = fieldgroup_groups($type_name);
-  }
   $contexts = content_build_modes($contexts_selector);
 
   // Multigroups, extra values.
@@ -252,7 +248,7 @@ function content_multigroup_display_overview_form(&$form, &$form_state) {
     'table-single' => t('Table - Single column'),
     'table-multiple' => t('Table - Multiple columns'),
   );
-  foreach ($groups as $group_name => $group) {
+  foreach (fieldgroup_groups($type_name) as $group_name => $group) {
     if ($group['group_type'] != 'multigroup') {
       continue;
     }