Commit 2ed71e50 authored by merlinofchaos's avatar merlinofchaos

#140431: Taxonomy select boxes were improperly showing descriptions.

parent 131adf93
......@@ -230,14 +230,7 @@ function taxonomy_views_default_views() {
function views_taxonomy_form(&$vocabulary) {
if ($vocabulary->tags) {
if ($vocabulary->help) {
$help = $vocabulary->help;
}
else {
$help = t('A comma-separated list of terms describing this content. Example: funny, bungee jumping, "Company, Inc.".');
}
$form = array('#type' => 'textfield',
'#description' => $help,
'#autocomplete_path' => 'taxonomy/autocomplete/'. $vocabulary->vid,
'#process' => array('views_taxonomy_process_form' => array()),
'#maxlength' => 255,
......@@ -246,6 +239,7 @@ function views_taxonomy_form(&$vocabulary) {
else {
$form = taxonomy_form($vocabulary->vid, 0, $vocabulary->help);
unset($form['#title']);
unset($form['#description']);
unset($form['#options'][0]);
}
return $form;
......
......@@ -2235,7 +2235,7 @@ function views_t_strings($text) {
}
/**
* invalidate the views cache when taxonomy vocabulary changes.
* Invalidate the views cache when taxonomy vocabulary changes.
*/
function views_taxonomy($op, $type, $object = NULL) {
if ($type == 'vocabulary' && $op == 'delete' || $op == 'insert' || $op == 'update') {
......
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