From 69eaeefe5daba0de292fed353d6f8aebffc74599 Mon Sep 17 00:00:00 2001
From: recrit <recrit@452914.no-reply.drupal.org>
Date: Wed, 13 Jun 2012 23:51:00 +0200
Subject: [PATCH] Issue #1591678 by recrit, damiankloip, tim.plunkett: Ensure
that entity_type isset on the results object in
views_handler_field_field::post_execute().
---
modules/field/views_handler_field_field.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/field/views_handler_field_field.inc b/modules/field/views_handler_field_field.inc
index b1f8767e3bd4..a65203b0980b 100644
--- a/modules/field/views_handler_field_field.inc
+++ b/modules/field/views_handler_field_field.inc
@@ -639,7 +639,7 @@ function post_execute(&$values) {
$entities_by_type = array();
$revisions_by_type = array();
foreach ($values as $key => $object) {
- if (isset($object->{$this->aliases['entity_type']}) && isset($object->{$this->field_alias}) && !isset($values[$key]->_field_data[$this->field_alias])) {
+ if (isset($this->aliases['entity_type']) && isset($object->{$this->aliases['entity_type']}) && isset($object->{$this->field_alias}) && !isset($values[$key]->_field_data[$this->field_alias])) {
$entity_type = $object->{$this->aliases['entity_type']};
if (empty($this->definition['is revision'])) {
$entity_id = $object->{$this->field_alias};
--
GitLab