From 82ea60ce01492b6322f44280a4f14788e6ba081a Mon Sep 17 00:00:00 2001
From: Earl Miles <merlin@logrus.com>
Date: Tue, 5 May 2009 23:31:11 +0000
Subject: [PATCH] #448914: Fix a couple of notice errors with vocabulary
context.
---
plugins/content_types/vocabulary_context/vocabulary_terms.inc | 2 +-
plugins/contexts/vocabulary.inc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/content_types/vocabulary_context/vocabulary_terms.inc b/plugins/content_types/vocabulary_context/vocabulary_terms.inc
index 79897efc..066f2377 100644
--- a/plugins/content_types/vocabulary_context/vocabulary_terms.inc
+++ b/plugins/content_types/vocabulary_context/vocabulary_terms.inc
@@ -41,7 +41,7 @@ function ctools_vocabulary_terms_content_type_render($subtype, $conf, $panel_arg
$block->module = 'node_type';
$block->title = check_plain($vocab->name);
$block->content = $output;
- $block->delta = $vocab->tid;
+ $block->delta = $vocab->vid;
return $block;
}
diff --git a/plugins/contexts/vocabulary.inc b/plugins/contexts/vocabulary.inc
index 23cd96ec..d7777c8e 100644
--- a/plugins/contexts/vocabulary.inc
+++ b/plugins/contexts/vocabulary.inc
@@ -35,7 +35,7 @@ function ctools_context_create_vocabulary($empty, $data = NULL, $conf = FALSE) {
return $context;
}
- if ($conf) {
+ if ($conf && isset($data['vid'])) {
$data = taxonomy_vocabulary_load($data['vid']);
}
@@ -61,7 +61,7 @@ function ctools_context_vocabulary_settings_form($conf, $external = FALSE) {
'#title' => t('Vocabulary'),
'#type' => 'select',
'#options' => $options,
- '#default_value' => $conf['vids'],
+ '#default_value' => isset($conf['vids']) ? $conf['vids'] : array(),
'#prefix' => '<div class="clear-block">',
'#suffix' => '</div>',
'#description' => t('Select the vocabulary for this form.'),
--
GitLab