diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-06-14 18:59:12 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-06-14 18:59:12 +0000 |
| commit | c9e971759db48d610c81f5f1ae4d054c130f635a (patch) | |
| tree | 6939f286bd7c54d4a9bc4ff6204b3ef95b9a7846 /phpBB/includes/message_parser.php | |
| parent | 771d9f21cbcabd06535f1a32846b9fdc23f59df8 (diff) | |
| download | forums-c9e971759db48d610c81f5f1ae4d054c130f635a.tar forums-c9e971759db48d610c81f5f1ae4d054c130f635a.tar.gz forums-c9e971759db48d610c81f5f1ae4d054c130f635a.tar.bz2 forums-c9e971759db48d610c81f5f1ae4d054c130f635a.tar.xz forums-c9e971759db48d610c81f5f1ae4d054c130f635a.zip | |
- automatically sync topic_reported when deleting a post [Bug #2152]
- retrieve forum information in report.php
- don't update deleted topics
- proper permission check for "admin or moderator"
- allow changing poster while ip dropdown contains a different user [Bug #2190]
- fixed a typo in acp_styles [Bug #2188]
- allow inserting BBCode at the first position of the textarea [Bug #2078]
- allow the style name to be different than the style path
git-svn-id: file:///svn/phpbb/trunk@6063 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index be5669b702..8c9ecf6754 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1113,7 +1113,7 @@ class parse_message extends bbcode_firstpass if ($submit && in_array($mode, array('post', 'reply', 'quote', 'edit')) && $upload_file) { - if ($num_attachments < $cfg['max_attachments'] || $auth->acl_gets('m_', 'a_')) + if ($num_attachments < $cfg['max_attachments'] || $auth->acl_get('a_') || $auth->acl_get('m_', $forum_id)) { $filedata = upload_attachment($form_name, $forum_id, false, '', $is_message); $error = $filedata['error']; |