summaryrefslogtreecommitdiff
path: root/modules/taxonomy
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-03-10 01:40:12 -0600
committerwebchick <webchick@24967.no-reply.drupal.org>2011-03-10 01:40:12 -0600
commit34c6cdd66bac4c7b0c262cc2873c88a65f7b591c (patch)
treeaf26bdd33e7c96136bde2ab19c519c28e6ba2d76 /modules/taxonomy
parent6dabf4fc474bd3e3ad58e7733482c2d0f13220af (diff)
downloadbrdo-34c6cdd66bac4c7b0c262cc2873c88a65f7b591c.tar.gz
brdo-34c6cdd66bac4c7b0c262cc2873c88a65f7b591c.tar.bz2
Issue #1022924 by yched, chx: Fixed critical bug: Updates are broken for deleted fields in installs upgraded from rc1.
Diffstat (limited to 'modules/taxonomy')
-rw-r--r--modules/taxonomy/taxonomy.install8
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index e19f175ca..f28ffedf4 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -566,8 +566,12 @@ function taxonomy_update_7005(&$sandbox) {
// of term references stored so far for the current revision, which
// provides the delta value for each term reference data insert. The
// deltas are reset for each new revision.
-
- $field_info = _update_7000_field_read_fields();
+
+ $conditions = array(
+ 'type' => 'taxonomy_term_reference',
+ 'deleted' => 0,
+ );
+ $field_info = _update_7000_field_read_fields($conditions, 'field_name');
// This is a multi-pass update. On the first call we need to initialize some
// variables.