From 37b78e02594e95ac059a69fe47ee62bf24ce5db5 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Mon, 4 Jan 2010 03:57:19 +0000 Subject: #646874 by sun and David_Rothstein: Remove assumptions about Contextual links and Shortcut modules from template files. --- modules/contextual/contextual.module | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'modules/contextual') diff --git a/modules/contextual/contextual.module b/modules/contextual/contextual.module index 080cf0d3a..480f9e663 100644 --- a/modules/contextual/contextual.module +++ b/modules/contextual/contextual.module @@ -64,9 +64,6 @@ function contextual_library() { function contextual_preprocess(&$variables, $hook) { static $hooks; - // Initialize the $contextual_links template variable. - $variables['contextual_links'] = array(); - // Nothing to do here if the user is not permitted to access contextual links. if (!user_access('access contextual links')) { return; @@ -89,8 +86,8 @@ function contextual_preprocess(&$variables, $hook) { } if (isset($element) && is_array($element) && !empty($element['#contextual_links'])) { - $variables['contextual_links'] = contextual_links_view($element); - if (!empty($variables['contextual_links'])) { + $variables['title_suffix']['contextual_links'] = contextual_links_view($element); + if (!empty($variables['title_suffix']['contextual_links'])) { $variables['classes_array'][] = 'contextual-links-region'; } } -- cgit v1.2.3