diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-02 18:17:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-02 18:17:06 +0000 |
| commit | 1a18e36684d74d5a0c2538805a3ff8436036189e (patch) | |
| tree | 4876dd53349c44f7df2809370fdcdf1aef71c6c6 /phpBB/includes/functions_posting.php | |
| parent | 58d146cac61a8c574346ee794a04bdfeaab9215d (diff) | |
| download | forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar.gz forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar.bz2 forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar.xz forums-1a18e36684d74d5a0c2538805a3ff8436036189e.zip | |
- add even more bugs to the codebase
- changed submit_pm to carry on the from userdata
git-svn-id: file:///svn/phpbb/trunk@5241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index e1055cd5f8..8834a7161a 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -140,7 +140,8 @@ function update_last_post_information($type, $id) */ function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false) { - global $auth, $user, $config, $db, $phpbb_root_path; + global $auth, $user, $config, $db, $cache; + global $phpbb_root_path; $filedata = array(); $filedata['error'] = array(); @@ -164,18 +165,11 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage } $extensions = array(); - obtain_attach_extensions($extensions, $forum_id); + $cache->obtain_attach_extensions($extensions, $forum_id); $upload->set_allowed_extensions(array_keys($extensions['_allowed_'])); - if ($local) - { - $file = $upload->local_upload($local_storage); - } - else - { - $file = $upload->form_upload($form_name); - } + $file = ($local) ? $upload->local_upload($local_storage) : $upload->form_upload($form_name); if ($file->init_error) { @@ -475,11 +469,11 @@ function decode_message(&$message, $bbcode_uid = '') */ function posting_gen_topic_icons($mode, $icon_id) { - global $phpbb_root_path, $config, $template; + global $phpbb_root_path, $config, $template, $cache; // Grab icons $icons = array(); - obtain_icons($icons); + $cache->obtain_icons($icons); if (!$icon_id) { |