merge from branch 1.5.3.2 (~r11282)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-19 07:56:40 +00:00
commit 9f5e25a15e
136 changed files with 414 additions and 317 deletions

View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</script>

View file

@ -1,4 +1,4 @@
<script>//<<![CDATA[
<script type="text/javascript">//<<![CDATA[
var uploaded_fileinfo = {};
<!--@if($uploaded_fileinfo->error==0)-->

View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
parent.editor_upload_clear_list("{$editor_sequence}","{$upload_target_srl}");
<!--@foreach($file_list as $key => $file_info)-->