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

Issue #1555294 by Pol, tim.plunkett, oriol_e9g, cristinawithout, gagarine, dcam: Fixed Vocabulary title HTML entities are double encoded.

merge-requests/26/head
webchick 2012-09-05 22:58:31 -07:00
parent 5db3dd49ac
commit 33234ac2df
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/taxonomy/taxonomy.module
View File

@ -323,8 +323,8 @@ function taxonomy_menu() {
); );
$items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name'] = array( $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name'] = array(
'title callback' => 'taxonomy_admin_vocabulary_title_callback', 'title callback' => 'entity_label',
'title arguments' => array(3), 'title arguments' => array('taxonomy_vocabulary', 3),
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('taxonomy_overview_terms', 3), 'page arguments' => array('taxonomy_overview_terms', 3),
'access arguments' => array('administer taxonomy'), 'access arguments' => array('administer taxonomy'),
@ -375,7 +375,13 @@ function taxonomy_term_edit_access($term) {
} }
/** /**
* Return the vocabulary name given the vocabulary object. * Returns the sanitized name of a vocabulary.
*
* Deprecated. This function was previously used as a menu item title callback
* but has been replaced by using entity_label() (which does not
* sanitize the title, since the menu system does that automatically). In
* Drupal 7, use that function for title callbacks, and call check_plain()
* directly if you need a sanitized title.
*/ */
function taxonomy_admin_vocabulary_title_callback($vocabulary) { function taxonomy_admin_vocabulary_title_callback($vocabulary) {
return check_plain($vocabulary->name); return check_plain($vocabulary->name);

12
modules/taxonomy/taxonomy.test
View File

@ -98,6 +98,18 @@ class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
$edit['machine_name'] = '!&^%'; $edit['machine_name'] = '!&^%';
$this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save')); $this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save'));
$this->assertText(t('The machine-readable name must contain only lowercase letters, numbers, and underscores.')); $this->assertText(t('The machine-readable name must contain only lowercase letters, numbers, and underscores.'));
// Ensure that vocabulary titles are escaped properly.
$edit = array();
$edit['name'] = 'Don\'t Panic';
$edit['description'] = $this->randomName();
$edit['machine_name'] = 'don_t_panic';
$this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save'));
$site_name = variable_get('site_name', 'Drupal');
$this->drupalGet('admin/structure/taxonomy/don_t_panic');
$this->assertTitle(t('Don\'t Panic | @site-name', array('@site-name' => $site_name)));
$this->assertNoTitle(t('Don't Panic | @site-name', array('@site-name' => $site_name)));
} }
/** /**