- Patch #986992 by yched, sun: fixed insane etid / {field_config_entity_type()} abstraction.

1 files changed, 2 insertions, 4 deletions

diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index 15103ae48..73c115aa2 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -600,8 +600,6 @@ function taxonomy_update_7005(&$sandbox) {
     }
   }
   else {
-    $etid = _field_sql_storage_etid('node');
-
     // We do each pass in batches of 1000.
     $batch = 1000;
 
@@ -687,8 +685,8 @@ function taxonomy_update_7005(&$sandbox) {
 
       // Column names and values in field storage are the same for current and
       // revision.
-      $columns = array('etid', 'entity_id', 'revision_id', 'bundle', 'language', 'delta', $value_column);
-      $values = array($etid, $record->nid, $record->vid, $record->type, LANGUAGE_NONE, $deltas[$field_name]++, $record->tid);
+      $columns = array('entity_type', 'entity_id', 'revision_id', 'bundle', 'language', 'delta', $value_column);
+      $values = array('node', $record->nid, $record->vid, $record->type, LANGUAGE_NONE, $deltas[$field_name]++, $record->tid);
 
       // Insert rows into the revision table.
       db_insert($revision_name)->fields($columns)->values($values)->execute();