Skip to content
Snippets Groups Projects
Commit 82ea60ce authored by Earl Miles's avatar Earl Miles
Browse files

#448914: Fix a couple of notice errors with vocabulary context.

parent 2b2a4b10
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ function ctools_vocabulary_terms_content_type_render($subtype, $conf, $panel_arg ...@@ -41,7 +41,7 @@ function ctools_vocabulary_terms_content_type_render($subtype, $conf, $panel_arg
$block->module = 'node_type'; $block->module = 'node_type';
$block->title = check_plain($vocab->name); $block->title = check_plain($vocab->name);
$block->content = $output; $block->content = $output;
$block->delta = $vocab->tid; $block->delta = $vocab->vid;
return $block; return $block;
} }
......
...@@ -35,7 +35,7 @@ function ctools_context_create_vocabulary($empty, $data = NULL, $conf = FALSE) { ...@@ -35,7 +35,7 @@ function ctools_context_create_vocabulary($empty, $data = NULL, $conf = FALSE) {
return $context; return $context;
} }
if ($conf) { if ($conf && isset($data['vid'])) {
$data = taxonomy_vocabulary_load($data['vid']); $data = taxonomy_vocabulary_load($data['vid']);
} }
...@@ -61,7 +61,7 @@ function ctools_context_vocabulary_settings_form($conf, $external = FALSE) { ...@@ -61,7 +61,7 @@ function ctools_context_vocabulary_settings_form($conf, $external = FALSE) {
'#title' => t('Vocabulary'), '#title' => t('Vocabulary'),
'#type' => 'select', '#type' => 'select',
'#options' => $options, '#options' => $options,
'#default_value' => $conf['vids'], '#default_value' => isset($conf['vids']) ? $conf['vids'] : array(),
'#prefix' => '<div class="clear-block">', '#prefix' => '<div class="clear-block">',
'#suffix' => '</div>', '#suffix' => '</div>',
'#description' => t('Select the vocabulary for this form.'), '#description' => t('Select the vocabulary for this form.'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment