From 42cb958d6619d3e147e5db32ded1bb6b3b97051f Mon Sep 17 00:00:00 2001
From: flyskyko <sinsy200@gmail.com>
Date: Mon, 26 Sep 2011 04:56:01 +0000
Subject: [PATCH] issue 160, fix a bug for do not display layout instance that
 have a extra variable name "layout_type"

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9319 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/layout/layout.admin.controller.php | 2 +-
 modules/layout/tpl/layout_modify.html      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index cdfd4e50b..e34e69bef 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -27,7 +27,7 @@
             $args->layout_srl = getNextSequence();
             $args->layout = Context::get('layout');
             $args->title = Context::get('title');
-			$args->layout_type = Context::get('layout_type');
+			$args->layout_type = Context::get('_layout_type');
 			if(!$args->layout_type) $args->layout_type = "P";
 
 			// Insert into the DB
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index b6db3ff4c..f9d501b8d 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -8,7 +8,7 @@
 <input type="hidden" name="act" value="procLayoutAdminUpdate"|cond="$act == 'dispLayoutAdminModify'" value="procLayoutAdminInsert"|cond="$act == 'dispLayoutAdminInsert'" />
 <input type="hidden" name="layout_srl" value="{$layout_srl}" />
 <input type="hidden" name="layout" value="{$selected_layout->layout}" />
-<input type="hidden" name="layout_type" value="{$selected_layout->layout_type}" />
+<input type="hidden" name="_layout_type" value="{$selected_layout->layout_type}" />
 <input type="hidden" name="success_return_url" value="{getUrl('act', 'dispLayoutAdminInstanceList')}" />
 
 	<ul>
@@ -68,7 +68,7 @@
 				</block>
 
 				<select cond="$var->type == 'select'" name="{$name}">
-					<option loop="$var->options => $key, $val" value="{$key}" selected="selected"|cond="$key == $var->value">{$val->val}</option>
+					<option loop="$var->options => $key, $val" value="{$key}" selected="selected"|cond="$key == $var->value">{$val}</option>
 				</select>
 
 				<block cond="$var->type == 'radio'">