Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Marc Alexander 2020-01-01 16:47:40 +01:00
commit 372a3bfcde
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -38,7 +38,7 @@
<td class="attach-name"> <td class="attach-name">
<span class="file-name ellipsis-text"></span> <span class="file-name ellipsis-text"></span>
<span class="attach-controls"> <span class="attach-controls">
<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" />&nbsp; {% if S_BBCODE_ALLOWED %}<input type="button" value="{{ lang('PLACE_INLINE') }}" class="button2 hidden file-inline-bbcode" />&nbsp;{% endif %}
<input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" /> <input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" />
</span> </span>
<span class="clear"></span> <span class="clear"></span>
@ -64,7 +64,7 @@
<span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span> <span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span>
{% EVENT posting_attach_body_attach_row_controls_prepend %} {% EVENT posting_attach_body_attach_row_controls_prepend %}
<span class="attach-controls"> <span class="attach-controls">
<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF --> {% if S_BBCODE_ALLOWED and S_INLINE_ATTACHMENT_OPTIONS %}<input type="button" value="{{ lang('PLACE_INLINE') }}" class="button2 file-inline-bbcode" />&nbsp;{% endif %}
<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" /> <input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" />
</span> </span>
{% EVENT posting_attach_body_attach_row_controls_append %} {% EVENT posting_attach_body_attach_row_controls_append %}