From d2f75bfe92551c5e91bbb0ecfdc94b61cdc7bb03 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Wed, 20 Jul 2011 02:30:14 -0700
Subject: [PATCH] Issue #1206200 follow-up by chx: Commit missing hunk from 7.x
 version.

---
 .../modules/field_sql_storage/field_sql_storage.module   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 89aeca66f2fc..10bae64b5972 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);
@@ -614,6 +614,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().
  *
-- 
GitLab