diff options
Diffstat (limited to 'modules/taxonomy/taxonomy.module')
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index f5140ed1f..1f6c1eed0 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -346,11 +346,10 @@ function taxonomy_del_term($tid) { function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') { $vocabulary = taxonomy_vocabulary_load($vid); $help = ($help) ? $help : $vocabulary->help; - if ($vocabulary->required) { - $blank = 0; - } - else { - $blank = '<'. t('none') .'>'; + $blank = 0; + + if (!$vocabulary->multiple) { + $blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -'); } return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank); @@ -895,7 +894,7 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti $options = array(); if ($blank) { - $options[0] = $blank; + $options[''] = $blank; } if ($tree) { foreach ($tree as $term) { @@ -905,10 +904,6 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti $options[] = $choice; } } - if (!$blank && !$value) { - // required but without a predefined value, so set first as predefined - $value = $tree[0]->tid; - } } return array('#type' => 'select', |