fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-23 05:09:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.1.8

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/layout/conf/module.xml
View file

@ -36,17 +36,17 @@
</actions>
<menus>
<menu name="installedLayout">
<title xml:lang="en">Installed Layout</title>
<title xml:lang="en">Layouts</title>
<title xml:lang="ko">설치된 레이아웃</title>
<title xml:lang="zh-CN">Installed Layout</title>
<title xml:lang="jp">Installed Layout</title>
<title xml:lang="es">Installed Layout</title>
<title xml:lang="ru">Installed Layout</title>
<title xml:lang="fr">Installed Layout</title>
<title xml:lang="zh-TW">Installed Layout</title>
<title xml:lang="vi">Installed Layout</title>
<title xml:lang="mn">Installed Layout</title>
<title xml:lang="tr">Installed Layout</title>
<title xml:lang="zh-CN">Layouts</title>
<title xml:lang="jp">Layouts</title>
<title xml:lang="es">Layouts</title>
<title xml:lang="ru">Layouts</title>
<title xml:lang="fr">Layouts</title>
<title xml:lang="zh-TW">Layouts</title>
<title xml:lang="vi">Layouts</title>
<title xml:lang="mn">Layouts</title>
<title xml:lang="tr">Layouts</title>
</menu>
</menus>
</module>

2
modules/layout/lang/lang.xml
View file

@ -1003,7 +1003,7 @@
</item>
<item name="installed_layout">
<value xml:lang="ko"><![CDATA[설치된 레이아웃]]></value>
<value xml:lang="en"><![CDATA[Installed Layout]]></value>
<value xml:lang="en"><![CDATA[Layouts]]></value>
<value xml:lang="jp"><![CDATA[インストールされているレイアウト]]></value>
</item>
<item name="faceoff_export">

12
modules/layout/layout.admin.controller.php
View file

@ -235,13 +235,21 @@
**/
function procLayoutAdminCodeUpdate() {
$mode = Context::get('mode');
if ($mode == 'reset') return $this->procLayoutAdminCodeReset();
if ($mode == 'reset')
{
return $this->procLayoutAdminCodeReset();
}
$layout_srl = Context::get('layout_srl');
$code = Context::get('code');
$code_css = Context::get('code_css');
$is_post = (Context::getRequestMethod() == 'POST');
if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
if(!$layout_srl || !$code || !$is_post)
{
return new Object(-1, 'msg_invalid_request');
}
$code = preg_replace('/<\?.*(\?>)?/sm', '', $code);
$oLayoutModel = &getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);