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

Merge branch 'pr/57' into develop

Browse source 
Conflicts:
	modules/file/tpl/file_list.html
This commit is contained in:
bnu 2013-11-23 22:00:52 +09:00
commit ca87a2b199
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/file/tpl/file_list.html
View file

@ -70,7 +70,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<!--@endif-->
<!-- one document end -->
<tr>
<td><a href="{$val->download_url}">{htmlspecialchars($val->source_filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}</a></td>
<td><a href="{htmlspecialchars_decode($val->download_url)}">{htmlspecialchars($val->source_filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}</a></td>
<td class="nowr">{FileHandler::filesize($val->file_size)}</td>
<td class="nowr">{$val->download_count}</td>
<td class="nowr">

3
modules/menu/tpl/sitemap.html
View file

@ -1881,6 +1881,9 @@ jQuery(function($){
showMenuSelector($(this).find('._menuSelector_menuTreeContainer'), htInfo.url);
}else{
// URL shortcut
var htInfo_url = htInfo.url;
htInfo_url = htInfo_url.replace(/&amp;/g, '&');
htInfo.url = htInfo_url;
$(this).find('a[href="#fix_linkUrl"]').click();
$(this).find('._url_link').val($('<div />').text(htInfo.url).text());