### Eclipse Workspace Patch 1.0 #P CCK 6.x-2.x Index: includes/views/handlers/content_handler_field_multiple.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck/includes/views/handlers/Attic/content_handler_field_multiple.inc,v retrieving revision 1.1.2.18 diff -u -r1.1.2.18 content_handler_field_multiple.inc --- includes/views/handlers/content_handler_field_multiple.inc 7 May 2009 15:06:36 -0000 1.1.2.18 +++ includes/views/handlers/content_handler_field_multiple.inc 4 Jul 2009 23:33:13 -0000 @@ -194,7 +194,9 @@ return parent::render($values); } - $field = $this->content_field; + // We're down to a single node here, so we can retrieve the actual field + // definition for the node type being considered. + $field = content_fields($this->content_field['field_name'], $values->{$this->aliases['type']}); $options = $this->options; $vid = $values->{$this->field_alias}; Index: includes/views/handlers/content_handler_field.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck/includes/views/handlers/Attic/content_handler_field.inc,v retrieving revision 1.1.2.15 diff -u -r1.1.2.15 content_handler_field.inc --- includes/views/handlers/content_handler_field.inc 30 Mar 2009 22:54:16 -0000 1.1.2.15 +++ includes/views/handlers/content_handler_field.inc 4 Jul 2009 23:33:13 -0000 @@ -167,7 +167,11 @@ } function render($values) { - $field = $this->content_field; + // We're down to a single node here, so we can retrieve the actual field + // definition for the node type being considered. + $field = content_fields($this->content_field['field_name'], $values->{$this->aliases['type']}); + $options = $this->options; + $options = $this->options; $db_info = content_database_info($field);