Commit 939a1f01 authored by webchick's avatar webchick

#332145 by catch and Arancaytar: Fix regression on term submit form.

parent d8aafce2
......@@ -766,7 +766,7 @@ function taxonomy_form_term_submit($form, &$form_state) {
$current_parent_count = count($form_state['values']['parent']);
$previous_parent_count = count($form['#term']['parent']);
// Root doesn't count if it's the only parent.
if ($current_parent_count == 1 && isset($form_state['values']['parent'][''])) {
if ($current_parent_count == 1 && isset($form_state['values']['parent'][0])) {
$current_parent_count = 0;
$form_state['values']['parent'] = array();
}
......
......@@ -1089,7 +1089,7 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti
$options = array();
if ($blank) {
$options[''] = $blank;
$options[0] = $blank;
}
if ($tree) {
foreach ($tree as $term) {
......
......@@ -595,6 +595,9 @@ class TermEditTestCase extends DrupalWebTestCase {
'name' => $this->randomName(12),
'description' => $this->randomName(100),
);
// Explictly set the parents field to 'root', to ensure that
// taxonomy_form_term_submit() handles the invalid term ID correctly.
$edit['parent[]'] = 0;
// Create the term to edit (adding to the default 'Tags' vocabulary).
$this->drupalPost('admin/content/taxonomy/1/add/', $edit, t('Save'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment