From bb1aca2a8b117dee19022a8b62cd5cdd29c80b75 Mon Sep 17 00:00:00 2001 From: devjin Date: Thu, 22 Sep 2011 11:57:44 +0000 Subject: [PATCH] fix merge error git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9281 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.admin.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 8901126d8..df86c4b13 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -166,7 +166,7 @@ $security = new Security(); $security->encodeHTML('layout_list..title','layout_list..layout'); $security->encodeHTML('skin_list....'); - $security->encodeHTML('module_category...') + $security->encodeHTML('module_category...'); // Set the layout to be pop-up $this->setLayoutFile('popup_layout');