diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-06 13:53:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-06 13:53:18 +0000 |
| commit | b4d2641a595dcd25b52118793031e78f0e3b7da7 (patch) | |
| tree | dda3d40bb9b27070b4aed874f521a6e1bd9daba6 /phpBB/includes/ucp/ucp_pm_compose.php | |
| parent | 80b9fd04e06a8d48f84e493ca53fb73b4f4fa83d (diff) | |
| download | forums-b4d2641a595dcd25b52118793031e78f0e3b7da7.tar forums-b4d2641a595dcd25b52118793031e78f0e3b7da7.tar.gz forums-b4d2641a595dcd25b52118793031e78f0e3b7da7.tar.bz2 forums-b4d2641a595dcd25b52118793031e78f0e3b7da7.tar.xz forums-b4d2641a595dcd25b52118793031e78f0e3b7da7.zip | |
Separate display of posted attachments in posting screen and switch for template to indicate adding attachments are allowed. Related to Bug #13871
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8976 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_compose.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 1418d386e8..9ff473a66c 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -1036,11 +1036,11 @@ function compose_pm($id, $mode, $action) // Build custom bbcodes array display_custom_bbcodes(); + // Show attachment box for adding attachments if true + $allowed = ($auth->acl_get('u_pm_attach') && $config['allow_pm_attach'] && $form_enctype); + // Attachment entry - if ($auth->acl_get('u_pm_attach') && $config['allow_pm_attach'] && $form_enctype) - { - posting_gen_attachment_entry($attachment_data, $filename_data); - } + posting_gen_attachment_entry($attachment_data, $filename_data, $allowed); // Message History if ($action == 'reply' || $action == 'quote' || $action == 'forward') |