diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-08 12:51:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-08 12:51:43 +0000 |
| commit | 9d9d61b1a209098dc30d0905d88575a4f84cb197 (patch) | |
| tree | eeed66fe2ff92a246d498defd1863996737e4d59 /phpBB/posting.php | |
| parent | 89f1b88fe15da4fc8c25f456ef594f20a5357476 (diff) | |
| download | forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar.gz forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar.bz2 forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar.xz forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.zip | |
Merge revisions:
r8974, r8975, r8976, r8977, r8978, r8979
git-svn-id: file:///svn/phpbb/trunk@8980 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 1ec693e16f..32b03fb2f3 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1326,12 +1326,11 @@ if (($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_ ); } +// Show attachment box for adding attachments if true +$allowed = ($auth->acl_get('f_attach', $forum_id) && $auth->acl_get('u_attach') && $config['allow_attachments'] && $form_enctype); + // Attachment entry -// Not using acl_gets here, because it is using OR logic -if ($auth->acl_get('f_attach', $forum_id) && $auth->acl_get('u_attach') && $config['allow_attachments'] && $form_enctype) -{ - posting_gen_attachment_entry($attachment_data, $filename_data); -} +posting_gen_attachment_entry($attachment_data, $filename_data, $allowed); // Output page ... page_header($page_title); |