? 481568-fix-userreference-relationship.patch
? 505278-panels-fixes.patch
? cck-panels-relationships.patch
? content-relationships.patch
? node_from_noderef.inc.txt
? panels.patch
? relationships.patch
? user_from_userref.inc.txt
? includes/panels/content_types/505278-panels-fixes.patch
? includes/panels/content_types/icon_cck_field.png
? modules/flexifield-6.x-1.0-alpha5.tar.gz
? modules/plugin_manager
? modules/plugin_manager-6.x-1.x-dev.tar.gz
? modules/fieldgroup/panels/content_types/icon_cck_field_group.png
Index: includes/panels/content_types/content_field.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/includes/panels/content_types/Attic/content_field.inc,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 content_field.inc
--- includes/panels/content_types/content_field.inc	12 Jul 2009 20:15:58 -0000	1.1.2.7
+++ includes/panels/content_types/content_field.inc	18 Jul 2009 00:39:16 -0000
@@ -13,6 +13,7 @@ function content_content_field_ctools_co
   return array(
     'title' => t('Content field'),
     'defaults' => array('label' => '', 'formatter' => ''),
+    'content type' => 'content_content_field_content_type_content_type',
   );
 }
 
@@ -30,8 +31,9 @@ function content_content_field_content_t
     foreach ($type['fields'] as $field_name => $field) {
       if (!isset($types[$field_name])) {
         $types[$field_name] = array(
-          'category' => t('Content'),
-          'title' => t('field: @widget_label (@field_name) - @field_type', array(
+          'category' => t('Node'),
+          'icon' => 'icon_cck_field.png',
+          'title' => t('Field: @widget_label (@field_name) - @field_type', array(
             '@widget_label' => t($field['widget']['label']),
             '@field_name' => $field_name,
             '@field_type' => t($field_types[$field['type']]['label']),
@@ -59,9 +61,35 @@ function content_content_field_content_t
 }
 
 /**
+ * Just one subtype.
+ *
+ * Ordinarily this function is meant to get just one subtype. However, we are
+ * using it to deal with the fact that we have changed the subtype names. This
+ * lets us translate the name properly.
+ */
+function content_content_field_content_type_content_type($subtype) {
+  // Previous versions of CCK included the content type as part of the subtype.
+  // This allows those to continue to sort of work, at least during render.
+  if (strpos($subtype, ':') !== FALSE) {
+    list($content_type, $subtype) = explode(':', $subtype, 2);
+  }
+
+  $types = content_content_field_content_type_content_types();
+  if (isset($types[$subtype])) {
+    return $types[$subtype];
+  }
+}
+
+/**
  * Output function for the 'field' content type.
  */
 function content_content_field_content_type_render($subtype, $conf, $panel_args, $context) {
+  // Previous versions of CCK included the content type as part of the subtype.
+  // This allows those to continue to sort of work, at least during render.
+  if (strpos($subtype, ':') !== FALSE) {
+    list($content_type, $subtype) = explode(':', $subtype, 2);
+  }
+
   if (is_array($context)) {
     $context = array_pop($context);
   }
@@ -160,6 +188,12 @@ function content_content_field_content_t
  * Admin title for field content type.
  */
 function content_content_field_content_type_admin_title($subtype, $conf, $context) {
+  // Previous versions of CCK included the content type as part of the subtype.
+  // This allows those to continue to sort of work, at least during render.
+  if (strpos($subtype, ':') !== FALSE) {
+    list($content_type, $subtype) = explode(':', $subtype, 2);
+  }
+
   // Get all fields on the site.
   $field_types = _content_field_types();
 
Index: modules/fieldgroup/panels/content_types/content_fieldgroup.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/fieldgroup/panels/content_types/Attic/content_fieldgroup.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 content_fieldgroup.inc
--- modules/fieldgroup/panels/content_types/content_fieldgroup.inc	12 Jul 2009 20:15:58 -0000	1.1.2.3
+++ modules/fieldgroup/panels/content_types/content_fieldgroup.inc	18 Jul 2009 00:39:16 -0000
@@ -37,8 +37,9 @@ function fieldgroup_content_fieldgroup_c
 
       // Assemble the information about the content type.
       $info = array(
-        'category' => t('Content'),
-        'title' => t('field group: @group in @type', array(
+        'category' => t('Node'),
+        'icon' => 'icon_cck_field_group.png',
+        'title' => t('Field group: @group in @type', array(
           '@group' => t($group['label']),
           '@type' => node_get_types('name', $group['type_name']),
         )),
@@ -62,6 +63,14 @@ function fieldgroup_content_fieldgroup_c
   }
   $node = drupal_clone($context->data);
 
+  // Make sure old data doesn't cause problems:
+  if (empty($conf['label'])) {
+    $conf['label'] = 'hidden';
+  }
+  if (empty($conf['format'])) {
+    $conf['format'] = 'simple';
+  }
+
   // Extract the node type and fieldgroup name from the subtype.
   list($node_type, $group_name) = explode(':', $subtype, 2);
 
Index: modules/nodereference/nodereference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/nodereference/Attic/nodereference.module,v
retrieving revision 1.138.2.57
diff -u -p -r1.138.2.57 nodereference.module
--- modules/nodereference/nodereference.module	24 Jun 2009 16:07:46 -0000	1.138.2.57
+++ modules/nodereference/nodereference.module	18 Jul 2009 00:39:17 -0000
@@ -68,7 +68,7 @@ function nodereference_field_info() {
     'nodereference' => array(
       'label' => t('Node reference'),
       'description' => t('Store the ID of a related node as an integer value.'),
-      'content_icon' => 'icon_content_noderef.png',
+//      'content_icon' => 'icon_content_noderef.png',
     ),
   );
 }
Index: modules/number/number.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/number/Attic/number.module,v
retrieving revision 1.91.2.35
diff -u -p -r1.91.2.35 number.module
--- modules/number/number.module	29 Apr 2009 20:51:53 -0000	1.91.2.35
+++ modules/number/number.module	18 Jul 2009 00:39:18 -0000
@@ -33,17 +33,17 @@ function number_field_info() {
     'number_integer' => array(
       'label' => t('Integer'),
       'description' => t('Store a number in the database as an integer.'),
-      'content_icon' => 'icon_content_number.png',
+//      'content_icon' => 'icon_content_number.png',
     ),
     'number_decimal' => array(
       'label' => t('Decimal'),
       'description' => t('Store a number in the database in a fixed decimal format.'),
-      'content_icon' => 'icon_content_number.png',
+//      'content_icon' => 'icon_content_number.png',
     ),
     'number_float' => array(
       'label' => t('Float'),
       'description' => t('Store a number in the database in a floating point format.'),
-      'content_icon' => 'icon_content_number.png',
+//      'content_icon' => 'icon_content_number.png',
     ),
   );
 }
Index: modules/text/text.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/text/Attic/text.module,v
retrieving revision 1.95.2.29
diff -u -p -r1.95.2.29 text.module
--- modules/text/text.module	29 Apr 2009 20:51:53 -0000	1.95.2.29
+++ modules/text/text.module	18 Jul 2009 00:39:18 -0000
@@ -40,7 +40,7 @@ function text_field_info() {
     'text' => array(
       'label' => t('Text'),
       'description' => t('Store text in the database.'),
-      'content_icon' => 'icon_content_text.png',
+//      'content_icon' => 'icon_content_text.png',
     ),
   );
 }
Index: modules/userreference/userreference.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/modules/userreference/Attic/userreference.module,v
retrieving revision 1.106.2.43
diff -u -p -r1.106.2.43 userreference.module
--- modules/userreference/userreference.module	2 Jun 2009 12:24:04 -0000	1.106.2.43
+++ modules/userreference/userreference.module	18 Jul 2009 00:39:19 -0000
@@ -60,7 +60,7 @@ function userreference_field_info() {
     'userreference' => array(
       'label' => t('User reference'),
       'description' => t('Store the ID of a related user as an integer value.'),
-      'content_icon' => 'icon_content_noderef.png',
+//      'content_icon' => 'icon_content_noderef.png',
     ),
   );
 }