From cce2b85a5f087ec4130c5de349b7aa561d2c20f5 Mon Sep 17 00:00:00 2001
From: flyskyko <sinsy200@gmail.com>
Date: Fri, 30 Sep 2011 08:59:14 +0000
Subject: [PATCH] issue 221, fixed a bug releated htmlspecialchars()

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

diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 15e309021..7de3e0829 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -175,7 +175,7 @@
 			$security->encodeHTML('menu_list..');
 
 			$security = new Security($layout_info);
-			$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..', 'extra_var....');
+			$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..');
 
 			$layout_info->description = nl2br(trim($layout_info->description));
 			if (!is_object($layout_info->extra_var)) $layout_info->extra_var = new StdClass();
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index fc4e0035f..fe5ccb837 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -58,14 +58,14 @@
 			<div class="a">
 				<div cond="$var->type == 'text'" class="multiLangEdit">
 					{@$use_multilang = true}
-					<input type="hidden" name="{$name}" value="{htmlspecialchars($var->value)}" class="vLang" />
+					<input type="hidden" name="{$name}" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value)}<!--@else-->{$var->value}<!--@end-->" class="vLang" />
 					<input type="text" id="{$name}" value="{$var->value}" class="vLang" />
 					<span class="desc"><a href="#langEdit" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
 				</div>
 
 				<div cond="$var->type == 'textarea'" class="multiLangEdit">
 					{@$use_multilang_textarea = true}
-					<input type="hidden" name="{$name}" value="{htmlspecialchars($var->value)}" class="vLang" />
+					<input type="hidden" name="{$name}" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value)}<!--@else-->{$var->value}<!--@end-->" class="vLang" />
 					<textarea id="{$name}" cols="42" rows="5" class="vLang">{$var->value}</textarea>
 					<span class="desc"><a href="#langEditTextarea" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
 				</div>