? ctools_field_fieldgroups.patch
? plugins
? modules/fieldgroup/plugins
Index: content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/Attic/content.module,v
retrieving revision 1.301.2.100
diff -u -p -r1.301.2.100 content.module
--- content.module	18 Mar 2009 19:20:52 -0000	1.301.2.100
+++ content.module	28 Apr 2009 15:33:32 -0000
@@ -51,9 +51,6 @@ function content_init() {
   if (module_exists('diff') && !function_exists('content_diff')) {
     module_load_include('inc', 'content', 'includes/content.diff');
   }
-  if (module_exists('panels')) {
-    module_load_include('inc', 'content', 'includes/content.panels');
-  }
 }
 
 /**
@@ -223,6 +220,15 @@ function content_views_api() {
 }
 
 /**
+ * Implementation of hook_ctools_plugin_directory().
+ */
+function content_ctools_plugin_directory($module, $plugin) {
+  if ($module == 'ctools') {
+    return 'plugins/' . $plugin;
+  }
+}
+
+/**
  * Load data for a node type's fields.
  * Implementation of hook_nodeapi 'load' op.
  *
Index: modules/fieldgroup/fieldgroup.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/fieldgroup/fieldgroup.module,v
retrieving revision 1.79.2.45
diff -u -p -r1.79.2.45 fieldgroup.module
--- modules/fieldgroup/fieldgroup.module	28 Feb 2009 23:56:17 -0000	1.79.2.45
+++ modules/fieldgroup/fieldgroup.module	28 Apr 2009 15:33:32 -0000
@@ -17,9 +17,6 @@
  */
 function fieldgroup_init() {
   drupal_add_css(drupal_get_path('module', 'fieldgroup') .'/fieldgroup.css');
-  if (module_exists('panels')) {
-    module_load_include('inc', 'fieldgroup', 'fieldgroup.panels');
-  }
 }
 
 /**
@@ -69,7 +66,7 @@ function fieldgroup_theme() {
     'fieldgroup_display_overview_form' => array(
       'arguments' => array('form' => NULL),
     ),
-    'fieldgroup_panel' => array(
+    'fieldgroup_content_type' => array(
       'arguments' => array('vars' => NULL, 'nid' => NULL),
     ),
   );
@@ -789,4 +786,13 @@ function fieldgroup_preprocess_node(&$va
     // '#chilren' might not be set if the group is empty.
     $vars[$group_name .'_rendered'] = isset($node->content[$group_name]['#children']) ? $node->content[$group_name]['#children'] : '';
   }
-}
\ No newline at end of file
+}
+
+/**
+ * Implementation of hook_ctools_plugin_directory().
+ */
+function fieldgroup_ctools_plugin_directory($module, $plugin) {
+  if ($module == 'ctools') {
+    return 'plugins/' . $plugin;
+  }
+}