Skip to content

Commit 8a6a8e6

Browse files
author
bnu
committed
Merge branch 'release/1.8.5'
2 parents 5c34d13 + 85e9be0 commit 8a6a8e6

File tree

13 files changed

+49
-57
lines changed

13 files changed

+49
-57
lines changed

‎classes/display/HTMLDisplayHandler.php

+4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ function toDoc(&$oModule)
6060

6161
$output = $oTemplate->compile($template_path, $tpl_file);
6262

63+
// SECISSUE https://github.com/xpressengine/xe-core/issues/1583
64+
$oSecurity = new Security();
65+
$oSecurity->encodeHTML('is_keyword');
66+
6367
// add .x div for adminitration pages
6468
if(Context::getResponseMethod() == 'HTML')
6569
{

‎common/js/plugins/jquery.fileupload/js/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
var $el = $(selected_el);
344344
var file_srl = $el.data().fileSrl;
345345

346-
exec_json('file.procFileSetCoverImage', {'file_srl': file_srl}, function(res) {
346+
exec_json('file.procFileSetCoverImage', {'file_srl' : file_srl, 'mid' : window.current_mid, 'editor_sequence' : data.editorSequence}, function(res) {
347347
if(res.error != 0) return;
348348

349349
data.settings.filelistImages.find('li').removeClass('xefu-is-cover-image');

‎common/js/plugins/jquery.fileupload/js/main.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/config.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/**
3030
* Display XE's full version.
3131
*/
32-
define('__XE_VERSION__', '1.8.4');
32+
define('__XE_VERSION__', '1.8.5');
3333
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
3434
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
3535
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

‎layouts/default/layout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1>
2222
<input type="hidden" name="vid" value="{$vid}" />
2323
<input type="hidden" name="mid" value="{$mid}" />
2424
<input type="hidden" name="act" value="IS" />
25-
<input type="text" name="is_keyword" value="{htmlspecialchars($is_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" required placeholder="{$lang->cmd_search}" title="{$lang->cmd_search}" />
25+
<input type="text" name="is_keyword" value="{$is_keyword}" required placeholder="{$lang->cmd_search}" title="{$lang->cmd_search}" />
2626
<input type="submit" value="{$lang->cmd_search}" />
2727
</form>
2828
<!-- /SEARCH -->

‎layouts/user_layout/layout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h1>Site Logo</h1>
66
<input type="hidden" name="vid" value="{$vid}" />
77
<input type="hidden" name="mid" value="{$mid}" />
88
<input type="hidden" name="act" value="IS" />
9-
<input type="text" name="is_keyword" value="{htmlspecialchars($is_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" title="{$lang->cmd_search}" />
9+
<input type="text" name="is_keyword" value="{$is_keyword}" title="{$lang->cmd_search}" />
1010
<input type="submit" value="{$lang->cmd_search}" />
1111
</form>
1212
<hr />

‎layouts/xedition/layout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
<input type="hidden" name="vid" value="{$vid}" />
171171
<input type="hidden" name="mid" value="{$mid}" />
172172
<input type="hidden" name="act" value="IS" />
173-
<input type="text" name="is_keyword" value="{htmlspecialchars($is_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" required="required" title="{$lang->cmd_search}" placeholder="Search" />
173+
<input type="text" name="is_keyword" value="{$is_keyword}" required="required" title="{$lang->cmd_search}" placeholder="Search" />
174174
</form>
175175
<!-- /SEARCH -->
176176
<a href="#" class="btn_close" title="{$lang->cmd_xedition_search_close}" onclick="return false"><i class="xi-close"></i><span class="blind">{$lang->cmd_xedition_search_close}</span></a>

‎modules/editor/skins/ckeditor/editor.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
settings.loadXeComponent = false;
6969
<!--@endif-->
7070

71-
<!--@if($module_type === 'comment')-->
71+
<!--@if($module_type === 'comment'||Mobile::isMobileCheckByAgent())-->
7272
settings.ckeconfig.toolbarStartupExpanded = false;
7373
<!--@endif-->
7474

‎modules/editor/skins/ckeditor/lang/lang.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<lang>
33
<item name="ckeditor_about_file_drop_area">
4-
<value xml:lang="ko"><![CDATA[여기에 파일을 끌어 놓거나 아래 파일 첨부 버튼을 클릭하세요.]]></value>
5-
<value xml:lang="en"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
6-
<value xml:lang="jp"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
7-
<value xml:lang="zh-CN"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
8-
<value xml:lang="zh-TW"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
9-
<value xml:lang="ru"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
10-
<value xml:lang="tr"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
11-
<value xml:lang="vi"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
4+
<value xml:lang="ko"><![CDATA[여기에 파일을 끌어 놓거나 파일 첨부 버튼을 클릭하세요.]]></value>
5+
<value xml:lang="en"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
6+
<value xml:lang="jp"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
7+
<value xml:lang="zh-CN"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
8+
<value xml:lang="zh-TW"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
9+
<value xml:lang="ru"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
10+
<value xml:lang="tr"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
11+
<value xml:lang="vi"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
1212
</item>
1313
<item name="ckeditor_file_uploading">
1414
<value xml:lang="ko"><![CDATA[파일 업로드 중...]]></value>
@@ -30,4 +30,4 @@
3030
<value xml:lang="tr"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
3131
<value xml:lang="vi"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
3232
</item>
33-
</lang>
33+
</lang>

0 commit comments

Comments
 (0)