Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #225864: rollback based on discussion.

merge-requests/26/head
Dries Buytaert 2009-06-21 14:13:59 +00:00
parent 29e3ab6091
commit 212d378177
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/taxonomy/taxonomy.module
View File

@ -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>';

14
modules/taxonomy/taxonomy.test
View File

@ -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'));
}
}