From e8755988b1138916696151f21bb8d30dbe09a528 Mon Sep 17 00:00:00 2001 From: Darren Oh Date: Wed, 10 Jul 2013 16:36:09 -0400 Subject: [PATCH] Issue #2015295 by Darren Oh: Fixed handling for generated fields in views. Generated fields were being marked as editable, causing a pop-up error when the page was viewed. --- edit.module | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/edit.module b/edit.module index c800fca..25ac5d5 100644 --- a/edit.module +++ b/edit.module @@ -435,12 +435,16 @@ function edit_preprocess_views_view_field(&$variables) { $entity_type = $entity_info['entity_type']; $entity = $entity_info['entity']; $field_name = $views_field->field; - $language = !empty($entity->language) ? $entity->language : LANGUAGE_NONE; - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - $edit_id = "$entity_type/$id/$field_name/$language/_custom_views"; + // Ensure that only real fields are marked as editable. + if (isset($entity->$field_name)) { + $language = !empty($entity->language) ? $entity->language : LANGUAGE_NONE; + list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - $variables['output'] = edit_wrap_pseudofield($variables['output'], $edit_id, _edit_is_extra_field($entity_type, $field_name)); + $edit_id = "$entity_type/$id/$field_name/$language/_custom_views"; + + $variables['output'] = edit_wrap_pseudofield($variables['output'], $edit_id, _edit_is_extra_field($entity_type, $field_name)); + } } } } -- 1.8.2