summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2011-05-04 01:00:31 (GMT)
committer Earl Miles2011-05-04 01:00:31 (GMT)
commit7fcecac8a2e574fd3d4217d68dd2b5dd0fe25c7f (patch)
tree880683a04beceef11196f53b72bead135fd31da0
parentac321929a5922acf56cdfa02f53b5bb3a0ee1db4 (diff)
Fix a couple of broken term relationships.
-rw-r--r--plugins/arguments/term.inc4
-rw-r--r--plugins/relationships/term_from_node.inc4
-rw-r--r--plugins/relationships/term_parent.inc6
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/arguments/term.inc b/plugins/arguments/term.inc
index 97667f1..f218d7f 100644
--- a/plugins/arguments/term.inc
+++ b/plugins/arguments/term.inc
@@ -28,7 +28,7 @@ $plugin = array(
function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
// If unset it wants a generic, unfilled context.
if ($empty) {
- return ctools_context_create_empty('term');
+ return ctools_context_create_empty('entity:taxonomy_term');
}
switch ($conf['input_form']) {
@@ -67,7 +67,7 @@ function ctools_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
return NULL;
}
- $context = ctools_context_create('term', $term);
+ $context = ctools_context_create('entity:taxonomy_term', $term);
$context->original_argument = $arg;
return $context;
}
diff --git a/plugins/relationships/term_from_node.inc b/plugins/relationships/term_from_node.inc
index 2469509..2304367 100644
--- a/plugins/relationships/term_from_node.inc
+++ b/plugins/relationships/term_from_node.inc
@@ -25,13 +25,13 @@ $plugin = array(
function ctools_term_from_node_context($context, $conf) {
// If unset it wants a generic, unfilled context, which is just NULL.
if (empty($context->data)) {
- return ctools_context_create_empty('term', NULL);
+ return ctools_context_create_empty('entity_taxonomy:term', NULL);
}
if (isset($context->data->taxonomy)) {
foreach ($context->data->taxonomy as $term) {
if ($term->vid == $conf['vid']) {
- return ctools_context_create('term', $term);
+ return ctools_context_create('entity:taxonomy_term', $term);
}
}
}
diff --git a/plugins/relationships/term_parent.inc b/plugins/relationships/term_parent.inc
index 5e541d6..0ee9ebf 100644
--- a/plugins/relationships/term_parent.inc
+++ b/plugins/relationships/term_parent.inc
@@ -13,7 +13,7 @@ $plugin = array(
'title' => t('Term parent'),
'keyword' => 'parent_term',
'description' => t('Adds a taxonomy term parent from a term context.'),
- 'required context' => new ctools_context_required(t('Term'), 'term'),
+ 'required context' => new ctools_context_required(t('Term'), 'entity_taxonomy_term'),
'context' => 'ctools_term_parent_context',
'edit form' => 'ctools_term_parent_settings_form',
'defaults' => array('type' => 'top'),
@@ -25,7 +25,7 @@ $plugin = array(
function ctools_term_parent_context($context, $conf) {
// If unset it wants a generic, unfilled context, which is just NULL.
if (empty($context->data)) {
- return ctools_context_create_empty('term');
+ return ctools_context_create_empty('entity:taxonomy_term');
}
if (isset($context->data)) {
@@ -46,7 +46,7 @@ function ctools_term_parent_context($context, $conf) {
// Load the term.
if ($result) {
$term = taxonomy_term_load($result['tid']);
- return ctools_context_create('term', $term);
+ return ctools_context_create('entity:taxonomy_term', $term);
}
}
}