Issue #1301660: Vocabulary context was not properly updated to new entity context.

diff --git a/plugins/arguments/vid.inc b/plugins/arguments/vid.inc
index bc5c7b8..064b22d 100644 (file)
--- a/plugins/arguments/vid.inc
+++ b/plugins/arguments/vid.inc
@@ -29,7 +29,7 @@ $plugin = array(
 function ctools_vid_context($arg = NULL, $conf = NULL, $empty = FALSE) {
   // If unset it wants a generic, unfilled context.
   if ($empty) {
-    return ctools_context_create_empty('vocabulary');
+    return ctools_context_create_empty('entity:taxonomy_vocabulary');
   }
 
   if (!is_numeric($arg)) {

diff --git a/plugins/content_types/node_context/node_content.inc b/plugins/content_types/node_context/node_content.inc
index 38c5b57..e35237e 100644 (file)
--- a/plugins/content_types/node_context/node_content.inc
+++ b/plugins/content_types/node_context/node_content.inc
@@ -132,6 +132,7 @@ function ctools_node_content_render_node($node, $conf) {
     $content['links']['#access'] = FALSE;
   }
 
+  dsm($content);
   return $content;
 }
 

diff --git a/plugins/content_types/vocabulary_context/vocabulary_terms.inc b/plugins/content_types/vocabulary_context/vocabulary_terms.inc
index 6127ac1..358d3c5 100644 (file)
--- a/plugins/content_types/vocabulary_context/vocabulary_terms.inc
+++ b/plugins/content_types/vocabulary_context/vocabulary_terms.inc
@@ -10,7 +10,7 @@ if (module_exists('taxonomy')) {
     'title' => t('Vocabulary terms'),
     'icon' => 'icon_vocabulary.png',
     'description' => t('All the terms in a vocabulary.'),
-    'required context' => new ctools_context_required(t('Vocabulary'), 'vocabulary'),
+    'required context' => new ctools_context_required(t('Vocabulary'), 'entity:taxonomy_vocabulary'),
     'category' => t('Vocabulary'),
     'defaults' => array('max_depth' => 0, 'tree' => 1),
   );

diff --git a/plugins/contexts/vocabulary.inc b/plugins/contexts/vocabulary.inc
index 4930c24..9c5d4cf 100644 (file)
--- a/plugins/contexts/vocabulary.inc
+++ b/plugins/contexts/vocabulary.inc
@@ -21,6 +21,7 @@ $plugin = array(
   // This context is deprecated and should not be usable in the UI.
   'no ui' => TRUE,
   'no required context ui' => TRUE,
+  'superceded by' => 'entity:taxonomy_vocabulary',
 );
 
 /**