summaryrefslogtreecommitdiffstats
path: root/core/modules/views/src/EntityViewsData.php
diff options
context:
space:
mode:
Diffstat (limited to 'core/modules/views/src/EntityViewsData.php')
-rw-r--r--core/modules/views/src/EntityViewsData.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php
index 49b0af8..248a74c 100644
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
@@ -378,13 +378,10 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
// @todo Introduce concept of the "main" column for a field, rather than
// assuming the first one is the main column. See also what the
// mapSingleFieldViewsData() method does with $first.
- $multiple = (count($field_column_mapping) > 1);
$first = TRUE;
foreach ($field_column_mapping as $field_column_name => $schema_field_name) {
- $views_field_name = ($multiple) ? $field_name . '__' . $field_column_name : $field_name;
- $table_data[$views_field_name] = $this->mapSingleFieldViewsData($table, $field_name, $field_definition_type, $field_column_name, $field_schema['columns'][$field_column_name]['type'], $first, $field_definition);
-
- $table_data[$views_field_name]['entity field'] = $field_name;
+ $table_data[$schema_field_name] = $this->mapSingleFieldViewsData($table, $field_name, $field_definition_type, $field_column_name, $field_schema['columns'][$field_column_name]['type'], $first, $field_definition);
+ $table_data[$schema_field_name]['entity field'] = $field_name;
$first = FALSE;
}
}