diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install index db281af..6e97275 100644 --- a/modules/taxonomy/taxonomy.install +++ b/modules/taxonomy/taxonomy.install @@ -939,7 +939,7 @@ function taxonomy_update_7011(&$sandbox) { */ /** - * Add entity_revision_is_default nodes to the taxonomy index table. + * Add unpublished nodes to the taxonomy index table if it is a default revision. */ function taxonomy_update_7012(&$sandbox) { if (!isset($sandbox['total'])) { @@ -958,16 +958,16 @@ function taxonomy_update_7012(&$sandbox) { // Build the taxonomy index for each node. foreach ($nids as $nid) { $node = node_load($nid); - $isDefaultRevision = $node->status; + $is_default_revision = $node->status; if (module_exists('entity')) { $entity_type = 'node'; $entity = entity_load($entity_type, array($node->nid)); - $isDefaultRevision = (int) entity_revision_is_default($entity_type, $entity); + $is_default_revision = (int) entity_revision_is_default($entity_type, $entity); } - if($isDefaultRevision) { + if ($is_default_revision) { taxonomy_build_node_index($node); + $sandbox['last'] = $node->nid; } - $sandbox['last'] = $node->nid; } $sandbox['count'] += $batch_size; } diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index f4dd98a..e34b9d1 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1939,14 +1939,14 @@ function taxonomy_build_node_index($node) { $sticky = (int)(!empty($node->sticky)); } } - $isDefaultRevision = $status; + $is_default_revision = $status; if (module_exists('entity')) { $entity_type = 'node'; $entity = entity_load($entity_type, array($node->nid)); - $isDefaultRevision = (int) entity_revision_is_default($entity_type, $entity); + $is_default_revision = (int) entity_revision_is_default($entity_type, $entity); } // We only maintain the taxonomy index for the default node revision. - if ($isDefaultRevision) { + if ($is_default_revision) { // Collect a unique list of all the term IDs from all node fields. $tid_all = array(); foreach (field_info_instances('node', $node->type) as $instance) {