Merge branch 'malmani/patch-1' into develop

This commit is contained in:
Kijin Sung 2024-08-21 19:48:32 +09:00
commit a72b4081b6

View file

@ -1122,7 +1122,7 @@ class ModuleHandler extends Handler
if($layout_info) if($layout_info)
{ {
// Input extra_vars into $layout_info // Input extra_vars into $layout_info
if($layout_info->extra_var_count) if(isset($layout_info->extra_var_count) && $layout_info->extra_var_count)
{ {
foreach($layout_info->extra_var as $var_id => $val) foreach($layout_info->extra_var as $var_id => $val)
@ -1138,7 +1138,7 @@ class ModuleHandler extends Handler
} }
} }
// Set menus into context // Set menus into context
if($layout_info->menu_count) if(isset($layout_info->menu_count) && $layout_info->menu_count)
{ {
$oMenuAdminController = getAdminController('menu'); $oMenuAdminController = getAdminController('menu');
$homeMenuCacheFile = null; $homeMenuCacheFile = null;