Merge branch 'pr/57' into develop

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

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">