Commit 5c63406b authored by alexpott's avatar alexpott
Browse files

Issue #2002912 by markie: Rename Views method get_field_alias() to getFieldAlias().

parent b06ef6d1
...@@ -1044,9 +1044,11 @@ function add_groupby($clause) { ...@@ -1044,9 +1044,11 @@ function add_groupby($clause) {
/** /**
* Returns the alias for the given field added to $table. * Returns the alias for the given field added to $table.
* *
* @access protected
*
* @see views_plugin_query_default::add_field() * @see views_plugin_query_default::add_field()
*/ */
function get_field_alias($table_alias, $field) { protected function getFieldAlias($table_alias, $field) {
return isset($this->field_aliases[$table_alias][$field]) ? $this->field_aliases[$table_alias][$field] : FALSE; return isset($this->field_aliases[$table_alias][$field]) ? $this->field_aliases[$table_alias][$field] : FALSE;
} }
...@@ -1600,7 +1602,7 @@ function loadEntities(&$results) { ...@@ -1600,7 +1602,7 @@ function loadEntities(&$results) {
$entity_type = $table['entity_type']; $entity_type = $table['entity_type'];
$info = entity_get_info($entity_type); $info = entity_get_info($entity_type);
$id_key = empty($table['revision']) ? $info['entity_keys']['id'] : $info['entity_keys']['revision']; $id_key = empty($table['revision']) ? $info['entity_keys']['id'] : $info['entity_keys']['revision'];
$id_alias = $this->get_field_alias($table_alias, $id_key); $id_alias = $this->getFieldAlias($table_alias, $id_key);
foreach ($results as $index => $result) { foreach ($results as $index => $result) {
// Store the entity id if it was found. // Store the entity id if it was found.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment