diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-01-01 17:26:38 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-01 17:26:38 +0100 |
| commit | 97e93571535c58fc3b1cf766b23f43a54686809d (patch) | |
| tree | 7185197103f9e32eb5f54770d9cccb9702a42590 /phpBB | |
| parent | Merge pull request #5792 from KYPREO/ticket/16269 (diff) | |
| parent | [ticket/15592] Fix attachments place inline button if BBCode is disabled (diff) | |
| download | phpbb-97e93571535c58fc3b1cf766b23f43a54686809d.tar.gz phpbb-97e93571535c58fc3b1cf766b23f43a54686809d.tar.bz2 phpbb-97e93571535c58fc3b1cf766b23f43a54686809d.zip | |
Merge branch 'ticket/15592' into prep-release-3.2.9
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_attach_body.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index ff5bfe1b55..0363fe0f05 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -38,7 +38,7 @@ <td class="attach-name"> <span class="file-name ellipsis-text"></span> <span class="attach-controls"> - <input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" /> + {% if S_BBCODE_ALLOWED %}<input type="button" value="{{ lang('PLACE_INLINE') }}" class="button2 hidden file-inline-bbcode" /> {% endif %} <input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" /> </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> {% EVENT posting_attach_body_attach_row_controls_prepend %} <span class="attach-controls"> - <!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" /> <!-- ENDIF --> + {% if S_BBCODE_ALLOWED and S_INLINE_ATTACHMENT_OPTIONS %}<input type="button" value="{{ lang('PLACE_INLINE') }}" class="button2 file-inline-bbcode" /> {% endif %} <input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" /> </span> {% EVENT posting_attach_body_attach_row_controls_append %} |