diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-06-10 23:53:20 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-06-10 23:53:20 +0000 |
| commit | 72bb5082101318c820a34be9ee09a092bd81b4bc (patch) | |
| tree | 803d2757493ca72cab7d6fb85c7c49b34925bbca /phpBB/includes/functions_posting.php | |
| parent | 1c169ed0899e469db53dbdff11f3d0ca040f269d (diff) | |
| download | forums-72bb5082101318c820a34be9ee09a092bd81b4bc.tar forums-72bb5082101318c820a34be9ee09a092bd81b4bc.tar.gz forums-72bb5082101318c820a34be9ee09a092bd81b4bc.tar.bz2 forums-72bb5082101318c820a34be9ee09a092bd81b4bc.tar.xz forums-72bb5082101318c820a34be9ee09a092bd81b4bc.zip | |
- allow searching for post_count = 0 [Bug #2154]
- better permission check for user search by ip
- permissions for max attachments adjusted
git-svn-id: file:///svn/phpbb/trunk@6046 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 7f5e40e8bb..c15726e2c8 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -334,12 +334,12 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage $filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0; // Check Image Size, if it is an image - if (!$auth->acl_gets('m_', 'a_') && $cat_id == ATTACHMENT_CATEGORY_IMAGE) + if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE) { $file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']); } - if (!$auth->acl_gets('a_', 'm_')) + if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id)) { $allowed_filesize = ($extensions[$file->get('extension')]['max_filesize'] != 0) ? $extensions[$file->get('extension')]['max_filesize'] : (($is_message) ? $config['max_filesize_pm'] : $config['max_filesize']); $file->upload->set_max_filesize($allowed_filesize); |