' . t('Taxonomy is for categorizing content. Terms are grouped into vocabularies. For example, a vocabulary called "Fruit" would contain the terms "Apple" and "Banana".') . '
'; return $output; case 'admin/structure/taxonomy/%': - $vocabulary = taxonomy_vocabulary_load($arg[3]); + $vocabulary = taxonomy_vocabulary_machine_name_load($arg[3]); switch ($vocabulary->hierarchy) { case 0: return '' . t('You can reorganize the terms in %capital_name using their drag-and-drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) . '
'; @@ -109,8 +109,8 @@ function taxonomy_entity_info() { $return['taxonomy_term']['bundles'][$machine_name] = array( 'label' => $vocabulary->name, 'admin' => array( - 'path' => 'admin/structure/taxonomy/%taxonomy_vocabulary', - 'real path' => 'admin/structure/taxonomy/' . $vocabulary->vid, + 'path' => 'admin/structure/taxonomy/%taxonomy_vocabulary_machine_name', + 'real path' => 'admin/structure/taxonomy/' . $machine_name, 'bundle argument' => 3, 'access arguments' => array('administer taxonomy'), ), @@ -302,7 +302,7 @@ function taxonomy_menu() { 'file' => 'taxonomy.pages.inc', ); - $items['admin/structure/taxonomy/%taxonomy_vocabulary'] = array( + $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name'] = array( 'title callback' => 'taxonomy_admin_vocabulary_title_callback', 'title arguments' => array(3), 'page callback' => 'drupal_get_form', @@ -310,12 +310,12 @@ function taxonomy_menu() { 'access arguments' => array('administer taxonomy'), 'file' => 'taxonomy.admin.inc', ); - $items['admin/structure/taxonomy/%taxonomy_vocabulary/list'] = array( + $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -20, ); - $items['admin/structure/taxonomy/%taxonomy_vocabulary/edit'] = array( + $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/edit'] = array( 'title' => 'Edit', 'page callback' => 'drupal_get_form', 'page arguments' => array('taxonomy_form_vocabulary', 3), @@ -325,7 +325,7 @@ function taxonomy_menu() { 'file' => 'taxonomy.admin.inc', ); - $items['admin/structure/taxonomy/%taxonomy_vocabulary/add'] = array( + $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/add'] = array( 'title' => 'Add term', 'page callback' => 'drupal_get_form', 'page arguments' => array('taxonomy_form_term', array(), 3), @@ -975,6 +975,21 @@ function taxonomy_vocabulary_load($vid) } /** + * Return the vocabulary object matching a vocabulary machine name. + * + * @param $name + * The vocabulary's machine name. + * + * @return + * The vocabulary object with all of its metadata, if exists, FALSE otherwise. + * Results are statically cached. + */ +function taxonomy_vocabulary_machine_name_load($name) { + $vocabularies = taxonomy_vocabulary_load_multiple(NULL, array('machine_name' => $name)); + return reset($vocabularies); +} + +/** * Return the term object matching a term ID. * * @param $tid Index: modules/taxonomy/taxonomy.test =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v retrieving revision 1.72 diff -u -p -r1.72 taxonomy.test --- modules/taxonomy/taxonomy.test 7 Mar 2010 23:14:20 -0000 1.72 +++ modules/taxonomy/taxonomy.test 17 Mar 2010 07:53:06 -0000 @@ -163,7 +163,7 @@ class TaxonomyVocabularyFunctionalTest e // Delete the vocabulary. $edit = array(); - $this->drupalPost('admin/structure/taxonomy/' . $vid . '/edit', $edit, t('Delete')); + $this->drupalPost('admin/structure/taxonomy/' . $vocabulary->machine_name . '/edit', $edit, t('Delete')); $this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', array('%name' => $vocabulary->name)), t('[confirm deletion] Asks for confirmation.')); $this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), t('[confirm deletion] Inform that all terms will be deleted.')); @@ -455,14 +455,14 @@ class TaxonomyTermTestCase extends Taxon $edit['parent[]'] = array(0); // Create the term to edit. - $this->drupalPost('admin/structure/taxonomy/' . $this->vocabulary->vid . '/add', $edit, t('Save')); + $this->drupalPost('admin/structure/taxonomy/' . $this->vocabulary->machine_name . '/add', $edit, t('Save')); $terms = taxonomy_get_term_by_name($edit['name']); $term = reset($terms); $this->assertNotNull($term, t('Term found in database')); // Submitting a term takes us to the add page; we need the List page. - $this->drupalGet('admin/structure/taxonomy/' . $this->vocabulary->vid); + $this->drupalGet('admin/structure/taxonomy/' . $this->vocabulary->machine_name); // Test edit link as accessed from Taxonomy administration pages. // Because Simpletest creates its own database when running tests, we know @@ -516,7 +516,7 @@ class TaxonomyTermTestCase extends Taxon // tabledrag.js by changing the page HTML source. Each term has three hidden // fields, "tid:1:0[tid]", "tid:1:0[parent]", and "tid:1:0[depth]". The // order of the input fields in the page is used when the form is processed. - $this->drupalGet('admin/structure/taxonomy/' . $this->vocabulary->vid); + $this->drupalGet('admin/structure/taxonomy/' . $this->vocabulary->machine_name); $reorder = array( 'tid:' . $term1->tid . ':0' => 'tid:' . $term2->tid . ':0', 'tid:' . $term2->tid . ':0' => 'tid:' . $term3->tid . ':0', @@ -546,7 +546,7 @@ class TaxonomyTermTestCase extends Taxon $this->assertEqual($terms[1]->parents, array($term2->tid), t('Term 3 was made a child of term 2.')); $this->assertEqual($terms[2]->tid, $term1->tid, t('Term 1 was moved below term 2.')); - $this->drupalPost('admin/structure/taxonomy/' . $this->vocabulary->vid, array(), t('Reset to alphabetical')); + $this->drupalPost('admin/structure/taxonomy/' . $this->vocabulary->machine_name, array(), t('Reset to alphabetical')); // Submit confirmation form. $this->drupalPost(NULL, array(), t('Reset to alphabetical')); @@ -688,7 +688,7 @@ class TaxonomyHooksTestCase extends Taxo 'name' => $this->randomName(), 'antonym' => 'Long', ); - $this->drupalPost('admin/structure/taxonomy/' . $vocabulary->vid . '/add', $edit, t('Save')); + $this->drupalPost('admin/structure/taxonomy/' . $vocabulary->machine_name . '/add', $edit, t('Save')); $terms = taxonomy_get_term_by_name($edit['name']); $term = reset($terms); $this->assertEqual($term->antonym, $edit['antonym'], t('Antonym was loaded into the term object'));