Menu fixes

ocproducts · Jul 13, 2019 · c9745a8 · c9745a8
1 parent 74878e3
commit c9745a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/sources/blocks/menu.php b/sources/blocks/menu.php
@@ -74,7 +74,7 @@ public function run($map)
         }
 
         $type = isset($map['type']) ? $map['type'] : 'embossed';
-        if ($type != 'dropdown' && $type != 'tree' && $type != 'embossed' && $type != 'popup' && $type != 'select') {
+        if ($type != 'dropdown' && $type != 'tree' && $type != 'embossed' && $type != 'popup' && $type != 'select' && $type != 'sitemap' && $type != 'mobile') {
             $exists = file_exists(get_file_base() . '/themes/default/templates/MENU_BRANCH_' . $type . '.tpl');
             if (!$exists) {
                 $exists = file_exists(get_custom_file_base() . '/themes/default/templates_custom/MENU_BRANCH_' . $type . '.tpl');

diff --git a/sources/menus.php b/sources/menus.php
@@ -375,6 +375,10 @@ function _build_stored_menu_branch($item, $items)
                 switch ($item['i_include_sitemap']) {
                     case INCLUDE_SITEMAP_OVER:
                         $branches = $extra_branch['children'];
+                        if (array_key_exists(0, $branches)) {
+                            $branch['children'] = $branches[0]['children'];
+                            $branches[0] = $branch;
+                        }
                         break;
 
                     case INCLUDE_SITEMAP_UNDER:

diff --git a/themes/default/javascript/menu_popup.js b/themes/default/javascript/menu_popup.js
@@ -69,6 +69,7 @@ function pop_up_menu(id,place,menu,event,outside_fixed_width)
 	if (typeof outside_fixed_width=='undefined') outside_fixed_width=false;
 
 	var e=document.getElementById(id);
+	if (!e) return false;
 
 	if (window.clean_menus_timeout)
 	{