diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 6 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.test | 14 |
2 files changed, 2 insertions, 18 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 2c6d5fdd9..4c669c099 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1707,10 +1707,8 @@ function taxonomy_node_validate($node, $form) { */ function taxonomy_node_update_index($node) { $output = array(); - if (isset($node->taxonomy) && is_array($node->taxonomy)) { - foreach ($node->taxonomy as $term) { - $output[] = $term->name; - } + foreach ($node->taxonomy as $term) { + $output[] = $term->name; } if (count($output)) { return '<strong>(' . implode(', ', $output) . ')</strong>'; diff --git a/modules/taxonomy/taxonomy.test b/modules/taxonomy/taxonomy.test index 897dc5220..1ce32fef4 100644 --- a/modules/taxonomy/taxonomy.test +++ b/modules/taxonomy/taxonomy.test @@ -371,20 +371,6 @@ class TaxonomyTermUnitTest extends TaxonomyWebTestCase { // Confirm that the node type argument returns a single node association. $this->assertEqual(taxonomy_term_count_nodes($term3->tid, 'page'), 1, t("Term is associated with one node of type 'page'.")); - - // Test hook_nodeapi_update_index(). - // Load the node so taxonomy terms are fully populated. - $node = node_load($node1->nid); - $output = taxonomy_node_update_index($node); - $this->assertFalse(empty($output), t('Node with taxonomy has content when calling update index')); - // Remove all taxonomy. - unset($node->taxonomy); - $output = taxonomy_node_update_index($node); - $this->assertTrue(empty($output), t('Node with no taxonomy has no content when calling update index')); - // Set taxonomy to a scalar (non-array). - $node->taxonomy = 1; - $output = taxonomy_node_update_index($node); - $this->assertTrue(empty($output), t('Node with non-array taxonomy has no content when calling update index')); } } |