Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2022-05-01 20:20:46 +02:00
commit c6c294e8c7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -180,16 +180,18 @@
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED --> {% if S_SOFTDELETE_ALLOWED || S_DELETE_ALLOWED %}
<hr class="dashed" /> <hr class="dashed">
<dl> <dl>
<dt><label for="delete">{L_DELETE_POST}{L_COLON}</label></dt> <dt><label for="delete">{{ lang('DELETE_POST') ~ lang('COLON') }}</label></dt>
<dd><label for="delete"><input type="checkbox" name="delete" id="delete" {S_SOFTDELETE_CHECKED} /> {L_DELETE_POST_WARN}</label></dd> {% if S_SOFTDELETE_ALLOWED %}
<!-- IF S_DELETE_ALLOWED and S_SOFTDELETE_ALLOWED --> <dd><label for="delete"><input type="checkbox" name="delete" id="delete" {{ S_SOFTDELETE_CHECKED }}> {{ lang('DELETE_POST_WARN') }}</label></dd>
<dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent" /> {L_DELETE_POST_PERMANENTLY}</label></dd> {% endif %}
<!-- ENDIF --> {% if S_DELETE_ALLOWED %}
<dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent"> {{ lang('DELETE_POST_PERMANENTLY') }}</label></dd>
{% endif %}
</dl> </dl>
<!-- ENDIF --> {% endif %}
<!-- IF S_EDIT_REASON --> <!-- IF S_EDIT_REASON -->
<dl> <dl>