#646874 by sun and David_Rothstein: Remove assumptions about Contextual links and Shortcut modules from template files.

1 files changed, 2 insertions, 5 deletions

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';
     }
   }