? .git
? .gitignore
? 0-views-file_managed_extras.patch
? 1000480-pager-quantity.patch
? 1002744-use-entity_load.patch
? 1006644-fields-no_bundle.patch
? 1006644-fields-no_bundle.pathc
? 1007036-history-join.patch
? 1007466-add_where_expression.patch
? 1007730-filter_string.patch
? 522318-views-display_description-human_name_1.patch
? 563020_views_object_cache_0.patch
? 667950-javascript-states-revert_1.patch
? 667950-javascript-states-revert_1_0.patch
? 667950-javascript-states-revert_1_0_2_0.patch
? 694094-drupal_static.patch
? 741234_views_empty_arg_check_null.patch
? 863478-distinct-support-broken.patch
? 870792-validation.patch
? 870792_1.patch
? 881060.patch
? 884730.patch
? 894618-filter_date-between.patch
? 895046-field_multiple.patch
? 930582-fix.patch
? 931552-fix.patch
? 931886.patch
? 931886_0.patch
? 936196-direct-loading.patch
? 936196-fix.patch
? 949526-external-db.patch
? 952636-filter.7.patch
? 960528-tablesort.patch
? 960596-quote.patch
? 963372-process_checkbox.patch
? 963454.patch
? 971326-join_deleted.patch
? 972934-desperate-try.patch
? 972934-try.patch
? 973698-theme_suggestion-field_field.patch
? 974542-notice-pre_render.patch
? 975400-refactor-field_render.patch
? 975400-refactor-field_render.ptach
? 976098-field-drupal_render-notice.patch
? 983460-table-default_sort-7.patch
? 983460-table-default_sort.patch
? 984390-pager.patch
? 985602-slave.patch
? 985602.patch
? 988490-global_counter.patch
? 988520-date_filter-offset.patch
? 993002-1_fix_notice.patch
? 993982-preprocess_fields-notice.patch
? 998278-field_data-etid-entity_type.patch
? 999330-entity-row.patch
? FALSE,
? add_where_expression
? d7_views_taxonomy_handlers.patch
? filter_format_4.patch
? foo.patch
? multiple.patch
? notices.patch
? revert.patch
? semantic.patch
? table-class-fix.patch
? taxonomy.patch
? views-field-comment-node-link-call-time-pass-by-reference.patch
? views-filter_numeric_test_0.patch
? views-or.patch
? views-term_fields_contain_tid_only.patch
? views-term_fields_contain_tid_only.patch.1
? views-test-user_argument_default.patch
? views.aggregator_feed_item_id.patch
? views_aggregator_fid_filter.patch
? views_formatter_settings-884730-
? views_formatter_settings-884730-43.patch
? views_formatter_settings-884730-61.patch
? views_formatter_settings-884730-63.patch
? views_formatter_settings.patch
? help/localization.html
? modules/field/views_handler_field_field_multiple.inc
? tests/field
? tests/taxonomy
Index: modules/field/views_handler_field_field.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/field/Attic/views_handler_field_field.inc,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 views_handler_field_field.inc
--- modules/field/views_handler_field_field.inc	19 Dec 2010 22:09:17 -0000	1.1.2.12
+++ modules/field/views_handler_field_field.inc	28 Dec 2010 08:10:29 -0000
@@ -189,7 +189,7 @@ class views_handler_field_field extends 
         $object = new stdClass();
         $object->{$entity_info['entity keys']['id']} = $row->{$this->field_alias};
         // Not every entity type has bundle and revision.
-        $bundle = '';
+        $bundle = NULL;
         if (!empty($entity_info['entity keys']['bundle'])) {
           $object->{$entity_info['entity keys']['bundle']} = $bundle = $row->{$this->aliases[$this->definition['field_name'] . '_bundle']};
         }
@@ -202,7 +202,13 @@ class views_handler_field_field extends 
 
         // The entity object needs to contain all fields, not just the one
         // being displayed, in order for field_view_field() to work properly.
-        foreach (field_info_instances($entity_type, $bundle) as $instance) {
+        $instances = field_info_instances($entity_type, $bundle);
+        if (!isset($bundle)) {
+          // Some entity types doesn't have bundles so field_info_instances behaves different.
+          $instances = $instances[$entity_type];
+        }
+
+        foreach ($instances as $instance) {
           $field_values = array();
           $field_info = field_info_field($instance['field_name']);
           foreach (array_keys($field_info['columns']) as $column_name) {