1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

- 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
This commit is contained in:
Meik Sievertsen
2005-10-02 18:17:06 +00:00
parent 58d146cac6
commit 1a18e36684
3 changed files with 50 additions and 33 deletions

View File

@@ -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)
{