diff -up apachesolr-6.x-2.x-dev_20100930/apachesolr.module apachesolr-6.x-2.x-dev_MOD/apachesolr.module
--- apachesolr-6.x-2.x-dev_20100930/apachesolr.module	2010-09-04 07:07:15.000000000 -0500
+++ apachesolr-6.x-2.x-dev_MOD/apachesolr.module	2010-10-07 11:22:58.000000000 -0500
@@ -1990,12 +1990,14 @@ function apachesolr_cck_fields() {
             $instance['indexing_callback'] = $mappings['per-field'][$field_name]['indexing_callback'];
             $instance['display_callback'] = $mappings['per-field'][$field_name]['display_callback'];
             $instance['facets'] = $mappings['per-field'][$field_name]['facets'];
+            $instance['facet_block_callback'] = $mappings['per-field'][$field_name]['facet_block_callback'];
           }
           else {
             $instance['index_type'] = $mappings[$field_type][$widget_type]['index_type'];
             $instance['indexing_callback'] = $mappings[$field_type][$widget_type]['indexing_callback'];
             $instance['display_callback'] = $mappings[$field_type][$widget_type]['display_callback'];
             $instance['facets'] = $mappings[$field_type][$widget_type]['facets'];
+            $instance['facet_block_callback'] = $mappings[$field_type][$widget_type]['facet_block_callback'];
           }
           $instance['multiple'] = (bool) $instance['multiple'];
           $instance['name'] = 'cck_' . $field_name;
diff -up apachesolr-6.x-2.x-dev_20100930/apachesolr_search.module apachesolr-6.x-2.x-dev_MOD/apachesolr_search.module
--- apachesolr-6.x-2.x-dev_20100930/apachesolr_search.module	2010-09-29 09:21:48.000000000 -0500
+++ apachesolr-6.x-2.x-dev_MOD/apachesolr_search.module	2010-10-07 11:22:10.000000000 -0500
@@ -415,8 +415,8 @@ function apachesolr_search_add_facet_par
         // TODO: generalize handling of date and range facets.
         // TODO: put field type in the facet definitions.
         // NOTE: This is a dependency on the apachesolr_date module. Using function_exists to avoid problems.
-        if (isset($facet_info[$module][$delta]['field_type'])
-              && in_array($facet_info[$module][$delta]['field_type'], array('date', 'datetime', 'datestamp'))
+        if (isset($facet_info[$module][$delta]['type'])
+              && in_array($facet_info[$module][$delta]['type'], array('date', 'datetime', 'datestamp'))
               && function_exists('apachesolr_date_search_date_range')) {
           list($start, $end, $gap) = apachesolr_date_search_date_range($query, $facet_field);
           if ($gap) {
Common subdirectories: apachesolr-6.x-2.x-dev_20100930/contrib and apachesolr-6.x-2.x-dev_MOD/contrib
Common subdirectories: apachesolr-6.x-2.x-dev_20100930/drush and apachesolr-6.x-2.x-dev_MOD/drush
Common subdirectories: apachesolr-6.x-2.x-dev_20100930/tests and apachesolr-6.x-2.x-dev_MOD/tests