summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Boyer2008-08-19 15:17:34 (GMT)
committer Sam Boyer2008-08-19 15:17:34 (GMT)
commiteb9ee7040a6449404dc69e32967a0e76770e6c1c (patch)
tree6da93ebc2cfec9795154e0bf603481ffca2ef7a8
parentb58365023e6e06a0895af2fe33604983873d39cf (diff)
Forgot some of the edits while forward-porting.
-rw-r--r--contexts/node.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/contexts/node.inc b/contexts/node.inc
index af75a01..33d54e1 100644
--- a/contexts/node.inc
+++ b/contexts/node.inc
@@ -16,7 +16,7 @@ function panels_node_panels_contexts() {
'settings form' => 'panels_context_node_settings_form',
'settings form validate' => 'panels_context_node_settings_form_validate',
'settings form submit' => 'panels_context_node_settings_form_submit',
-'keyword' => 'node',
+ 'keyword' => 'node',
'context name' => 'node',
);
return $args;
@@ -61,6 +61,12 @@ function panels_context_create_node($empty, $data = NULL, $conf = FALSE) {
$context->data = $data;
$context->title = $data->title;
$context->argument = $data->nid;
+ if (is_array($context->type)) {
+ $context->type[] = 'node-' . $data->type;
+ }
+ else {
+ $context->type = array($context->type, 'node-' . $data->type);
+ }
return $context;
}
}