? ctools-931648.patch ? includes/.directory Index: includes/content.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/content.inc,v retrieving revision 1.12.2.13 diff -u -p -r1.12.2.13 content.inc --- includes/content.inc 19 Aug 2010 20:35:03 -0000 1.12.2.13 +++ includes/content.inc 7 Oct 2010 23:09:04 -0000 @@ -69,11 +69,13 @@ function ctools_content_process(&$plugin else { $type = array( 'title' => $plugin['title'], - 'description' => $plugin['description'], 'icon' => $plugin['icon'], 'category' => $plugin['category'], ); + if (isset($plugin['description'])) { + $type['description'] = $plugin['description']; + } if (isset($plugin['required context'])) { $type['required context'] = $plugin['required context']; } Index: includes/context.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/context.inc,v retrieving revision 1.33.2.17 diff -u -p -r1.33.2.17 context.inc --- includes/context.inc 10 Sep 2010 17:07:52 -0000 1.33.2.17 +++ includes/context.inc 7 Oct 2010 23:09:04 -0000 @@ -1420,21 +1420,23 @@ function ctools_access($settings, $conte foreach ($settings['plugins'] as $test) { $pass = FALSE; - $plugin = ctools_get_access_plugin($test['name']); - if ($plugin && $function = ctools_plugin_get_function($plugin, 'callback')) { - // Do we need just some contexts or all of them? - if (!empty($plugin['all contexts'])) { - $test_contexts = $contexts; - } - else { - $required_context = isset($plugin['required context']) ? $plugin['required context'] : array(); - $context = isset($test['context']) ? $test['context'] : array(); - $test_contexts = ctools_context_select($contexts, $required_context, $context); - } - - $pass = $function($test['settings'], $test_contexts, $plugin); - if (!empty($test['not'])) { - $pass = !$pass; + if (isset($test['name'])) { + $plugin = ctools_get_access_plugin($test['name']); + if ($plugin && $function = ctools_plugin_get_function($plugin, 'callback')) { + // Do we need just some contexts or all of them? + if (!empty($plugin['all contexts'])) { + $test_contexts = $contexts; + } + else { + $required_context = isset($plugin['required context']) ? $plugin['required context'] : array(); + $context = isset($test['context']) ? $test['context'] : array(); + $test_contexts = ctools_context_select($contexts, $required_context, $context); + } + + $pass = $function($test['settings'], $test_contexts, $plugin); + if (!empty($test['not'])) { + $pass = !$pass; + } } }