diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-07-20 02:30:14 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-07-20 02:30:14 -0700 |
| commit | d2f75bfe92551c5e91bbb0ecfdc94b61cdc7bb03 (patch) | |
| tree | 2c56bf872390ff2ac6ad0511e7b354ebfdb84200 | |
| parent | be1bb23a1e16af14ca9ee7401e9be528c43796ed (diff) | |
| download | brdo-d2f75bfe92551c5e91bbb0ecfdc94b61cdc7bb03.tar.gz brdo-d2f75bfe92551c5e91bbb0ecfdc94b61cdc7bb03.tar.bz2 | |
Issue #1206200 follow-up by chx: Commit missing hunk from 7.x version.
| -rw-r--r-- | modules/field/modules/field_sql_storage/field_sql_storage.module | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module index 89aeca66f..10bae64b5 100644 --- a/modules/field/modules/field_sql_storage/field_sql_storage.module +++ b/modules/field/modules/field_sql_storage/field_sql_storage.module @@ -503,7 +503,7 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) { _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldConditions, $table_aliases, '_field_sql_storage_columnname'); // Add field meta conditions. - _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldMetaConditions, $table_aliases, function ($field_name, $column) { return $column; }); + _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldMetaConditions, $table_aliases, '_field_sql_storage_query_columnname'); if (isset($query->deleted)) { $select_query->condition("$field_base_table.deleted", (int) $query->deleted); @@ -615,6 +615,13 @@ function _field_sql_storage_query_field_conditions(EntityFieldQuery $query, Sele } /** + * Field meta condition column callback. + */ +function _field_sql_storage_query_columnname($field_name, $column) { + return $column; +} + +/** * Implements hook_field_storage_delete_revision(). * * This function actually deletes the data from the database. |