summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--includes/views/handlers/content_handler_field.inc5
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b714c20..138ddc9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -27,6 +27,7 @@ Bugfixes:
- #505278 by Michelle, merlinofchaos - Provide backward compatibility with previous method to build Panels 3 subtype names for fields.
- #523864 Minor coding style issues in Panels 3 relationships implementations.
- #481568 by merlinofchaos - Empty property error when attempting to save a user reference in Panels.
+- #510396 by yched - Use field/type definition to render fields in views.
CCK 6.x-2.4
===========
diff --git a/includes/views/handlers/content_handler_field.inc b/includes/views/handlers/content_handler_field.inc
index 3522541..708b5be 100644
--- a/includes/views/handlers/content_handler_field.inc
+++ b/includes/views/handlers/content_handler_field.inc
@@ -167,7 +167,10 @@ class content_handler_field extends views_handler_field_node {
}
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;
$db_info = content_database_info($field);