From 08bb4b52f5e153ea70e0fa3b65c985a23846cac9 Mon Sep 17 00:00:00 2001 From: Dylan Donkersgoed Date: Fri, 16 Feb 2018 20:49:53 -0500 Subject: [PATCH] 2934847-3 --- at_core/includes/misc.inc | 4 ++-- at_core/includes/suggestions.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/at_core/includes/misc.inc b/at_core/includes/misc.inc index 05e52a2..be066f7 100644 --- a/at_core/includes/misc.inc +++ b/at_core/includes/misc.inc @@ -46,8 +46,8 @@ function _at_core_layout_plugin_attributes($variables) { // Entity and bundle. if (isset($variables['content']['#entity_type'])) { $entity_type = $variables['content']['#entity_type']; - $bundle = $variables['content']['#bundle']; - $view_mode = $variables['content']['#view_mode']; + $bundle = !empty($variables['content']['#bundle']) ? $variables['content']['#bundle'] : $bundle; + $view_mode = !empty($variables['content']['#view_mode']) ? $variables['content']['#view_mode'] : $view_mode; $id = $variables['content']['#'. $entity_type]->id(); $entity_classes = !empty($variables['content']['#ds_configuration']['layout']['entity_classes']) ? $variables['content']['#ds_configuration']['layout']['entity_classes'] : ''; diff --git a/at_core/includes/suggestions.inc b/at_core/includes/suggestions.inc index 60e2867..51493d7 100644 --- a/at_core/includes/suggestions.inc +++ b/at_core/includes/suggestions.inc @@ -112,7 +112,7 @@ function at_core_theme_suggestions_block_alter(array &$suggestions, array $varia // Skin themes need to use the base themes block elements id to match the config setting. $variables['elements']['#id'] = str_replace($theme['name'], $theme['base'], $variables['elements']['#id']); } - if (isset($theme['config']['responsive_menu_block']) && $theme['config']['responsive_menu_block'] === $variables['elements']['#id']) { + if (isset($theme['config']['responsive_menu_block']) && !empty($variables['elements']['#id']) && $theme['config']['responsive_menu_block'] === $variables['elements']['#id']) { if (isset($theme['config']['enable_extensions']) && $theme['config']['enable_extensions'] === 1) { if (isset($theme['config']['enable_responsive_menus']) && $theme['config']['enable_responsive_menus'] === 1) { if (isset($theme['config']['responsive_menu_block'])) { -- 2.7.4