diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-03-04 02:46:12 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-03 16:24:12 +0200 |
commit | 50e3173e8c2f8304ad79e228df8526f9caf7b999 (patch) | |
tree | b3d34014715fbec39a19a37baed6c13e5fd8e519 /phpBB/includes | |
parent | 11c80c040243244757ea75ef4ab23a70a725254f (diff) | |
download | forums-50e3173e8c2f8304ad79e228df8526f9caf7b999.tar forums-50e3173e8c2f8304ad79e228df8526f9caf7b999.tar.gz forums-50e3173e8c2f8304ad79e228df8526f9caf7b999.tar.bz2 forums-50e3173e8c2f8304ad79e228df8526f9caf7b999.tar.xz forums-50e3173e8c2f8304ad79e228df8526f9caf7b999.zip |
[ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
PHPBB3-11586
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/functions_posting.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index a31d3b5a3f..d6f7c9bab4 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -403,14 +403,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage $upload->set_disallowed_content(explode('|', $config['mime_triggers'])); } - if (!$local) - { - $filedata['post_attach'] = ($upload->is_valid($form_name)) ? true : false; - } - else - { - $filedata['post_attach'] = true; - } + $filedata['post_attach'] = $local || $upload->is_valid($form_name); if (!$filedata['post_attach']) { |