Index: reptag.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/reptag.module,v
retrieving revision 1.35.2.7
diff -u -r1.35.2.7 reptag.module
--- reptag.module	3 Mar 2007 15:52:01 -0000	1.35.2.7
+++ reptag.module	6 Mar 2007 21:46:27 -0000
@@ -318,14 +318,14 @@
     && !variable_get('reptag_type_disable_'.$form_values['type']['#value'], 0)
     ) {
     if (variable_get('reptag_showhelp', 1)) {
-      $form_values['reptag'] = array(
+      $form_values['reptag_help'] = array(
         '#type' => 'fieldset',
         '#title' => t('Rep[lacement]Tags - Help'),
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
         '#weight' => 1
       );
-      $form_values['reptag'][] = _reptag_online_help();
+      $form_values['reptag_help'][] = _reptag_online_help();
     }
   }
 }
Index: reptag_admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/reptag_admin.inc,v
retrieving revision 1.12.2.10
diff -u -r1.12.2.10 reptag_admin.inc
--- reptag_admin.inc	26 Feb 2007 21:07:36 -0000	1.12.2.10
+++ reptag_admin.inc	6 Mar 2007 23:17:22 -0000
@@ -383,20 +383,44 @@
     }
     // cck fields
     if (!empty($type['fields'])) {
+      // special handling for fieldgroups
+      if (module_exists('fieldgroup')) {
+        $groups = fieldgroup_groups($type['type']);
+        foreach ($groups as $group) {
+          foreach ($group['fields'] as $field => $field_info) {
+            $field_path = 'content/'.$group['group_name'].'/'.$field.'/#value';
+            $form['content'][$type['type']][$field_path]['label'] = array('#value' => $field_info['label']);
+            if ($type['fields'][$field]['type'] == $type['fields'][$field]['widget']['type']) {
+              $form['content'][$type['type']][$field_path]['type'] = array('#value' => $type['fields'][$field]['type']);
+            }
+            else {
+              $form['content'][$type['type']][$field_path]['type'] = array('#value' => $type['fields'][$field]['type'].' / '.$type['fields'][$field]['widget']['type']);
+            }
+            $form['content'][$type['type']][$field_path]['process'] = array(
+              '#type' => 'checkbox',
+              '#title' => '',
+              '#return_value' => 1,
+              '#default_value' => ($type['fields'][$field]['type'] != 'text') ? FALSE : in_array($field_path, $fields),
+              '#disabled' => ($type['fields'][$field]['type'] != 'text') ? TRUE : FALSE
+            );
+            unset($type['fields'][$field]);
+          }
+        }
+      }
       foreach ($type['fields'] as $field => $field_info) {
-        _reptag_content_field_path($field, $field_info, $type);
-        $form['content'][$type['type']][$field]['label'] = array('#value' => $field_info['widget']['label']);
+        $field_path = 'content/'.$field.'/#value';
+        $form['content'][$type['type']][$field_path]['label'] = array('#value' => $field_info['widget']['label']);
         if ($field_info['type'] == $field_info['widget']['type']) {
-          $form['content'][$type['type']][$field]['type'] = array('#value' => $field_info['type']);
+          $form['content'][$type['type']][$field_path]['type'] = array('#value' => $field_info['type']);
         }
         else {
-          $form['content'][$type['type']][$field]['type'] = array('#value' => $field_info['type'].' / '.$field_info['widget']['type']);
+          $form['content'][$type['type']][$field_path]['type'] = array('#value' => $field_info['type'].' / '.$field_info['widget']['type']);
         }
-        $form['content'][$type['type']][$field]['process'] = array(
+        $form['content'][$type['type']][$field_path]['process'] = array(
           '#type' => 'checkbox',
           '#title' => '',
           '#return_value' => 1,
-          '#default_value' => ($field_info['type'] != 'text') ? FALSE : in_array($field, $fields),
+          '#default_value' => ($field_info['type'] != 'text') ? FALSE : in_array($field_path, $fields),
           '#disabled' => ($field_info['type'] != 'text') ? TRUE : FALSE
         );
       }
@@ -729,6 +753,10 @@
     }
   }
   drupal_set_message(t('The configuration options have been saved.'));
+  if (variable_get('reptag_cache', 0)) {
+    cache_clear_all('*', 'cache_reptag', TRUE);
+    drupal_set_message(t('The cache has been flushed to reflect the new configuration.'));
+  }
 }
 
 /**
Index: reptag_helper.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/Attic/reptag_helper.inc,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 reptag_helper.inc
--- reptag_helper.inc	3 Mar 2007 23:14:53 -0000	1.1.2.3
+++ reptag_helper.inc	6 Mar 2007 22:51:52 -0000
@@ -230,15 +230,6 @@
 }
 
 /**
- * function _reptag_content_field_path().
- * (find path to a certain field)
- */
-function _reptag_content_field_path(&$field, $field_info, $type) {
-  $field = 'content/'.$field.'/0/#value';
-  // todo: generic way to find the path to a field
-}
-
-/**
  * function _reptag_array_intersect_key().
  * (PHP4+5 array_intersect_key()-like replacement)
  */