diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc index 86d8d45..70917ba 100644 --- a/core/modules/taxonomy/taxonomy.admin.inc +++ b/core/modules/taxonomy/taxonomy.admin.inc @@ -692,7 +692,7 @@ function taxonomy_form_term($form, &$form_state, Term $term = NULL, Vocabulary $ $form['name'] = array( '#type' => 'textfield', '#title' => t('Name'), - '#default_value' => $term->label(), + '#default_value' => $term->name, '#maxlength' => 255, '#required' => TRUE, '#weight' => -5, @@ -861,7 +861,7 @@ function taxonomy_form_term_submit_build_taxonomy_term($form, &$form_state) { entity_form_submit_build_entity('taxonomy_term', $term, $form, $form_state); // Prevent leading and trailing spaces in term names. - $term->name = trim($term->label()); + $term->name = trim($term->name); // Convert text_format field into values expected by taxonomy_term_save(). $description = $form_state['values']['description']; @@ -899,7 +899,7 @@ function taxonomy_term_confirm_delete($form, &$form_state, Term $term) { $form['#term'] = $term; $form['#vocabulary'] = taxonomy_vocabulary_load($term->vid);; $form['type'] = array('#type' => 'value', '#value' => 'term'); - $form['name'] = array('#type' => 'value', '#value' => $term->label()); + $form['name'] = array('#type' => 'value', '#value' => $term->name); $form['vocabulary_machine_name'] = array('#type' => 'value', '#value' => $term->vocabulary_machine_name); $form['delete'] = array('#type' => 'value', '#value' => TRUE); return confirm_form($form, diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index f71eadc..a2b053b 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -627,7 +627,7 @@ function template_preprocess_taxonomy_term(&$variables) { $uri = entity_uri('taxonomy_term', $term); $variables['term_url'] = url($uri['path'], $uri['options']); - $variables['term_name'] = check_plain($term->label()); + $variables['term_name'] = check_plain($term->name); $variables['page'] = $variables['view_mode'] == 'full' && taxonomy_term_is_page($term); // Flatten the term object's member fields.