From b63411093eea56565ed9fc931d09e251b8e3b953 Mon Sep 17 00:00:00 2001 From: chschy Date: Thu, 13 Oct 2011 02:11:57 +0000 Subject: [PATCH] issue 428, when not exist, output warning messeage on layout create git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9626 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/layout/layout.admin.controller.php | 4 +++- modules/layout/tpl/layout_modify.html | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index e34e69bef..9271baf45 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -83,7 +83,9 @@ $oLayoutModel = &getModel('layout'); $oMenuAdminModel = &getAdminModel('menu'); $layout_info = $oLayoutModel->getLayout($args->layout_srl); - $menus = get_object_vars($layout_info->menu); + if($layout_info->menu) { + $menus = get_object_vars($layout_info->menu); + } if(count($menus) ) { foreach($menus as $menu_id => $val) { $menu_srl = Context::get($menu_id); diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html index fe5ccb837..3df6c31ef 100644 --- a/modules/layout/tpl/layout_modify.html +++ b/modules/layout/tpl/layout_modify.html @@ -120,8 +120,9 @@ -

{$lang->menu}

-