diff --git a/phpBB/download.php b/phpBB/download.php index 5a90059ae1..ff4b1660cc 100644 --- a/phpBB/download.php +++ b/phpBB/download.php @@ -53,8 +53,8 @@ if (isset($_GET['avatar'])) $db->sql_close(); exit; } - - $ext = substr(strrchr($filename, '.'), 1); + + $ext = substr(strrchr($filename, '.'), 1); $filename = intval($filename); if (!in_array($ext, array('png', 'gif', 'jpg', 'jpeg'))) @@ -242,8 +242,8 @@ else trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']); } - redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']); - exit; + redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']); + exit; } else { diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 6ee6d5f99d..c266870b87 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2176,8 +2176,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']); } - $params = 'f=' . $data['forum_id']; - $add_anchor = ''; + $params = $add_anchor = ''; if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) { @@ -2194,7 +2193,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u $params .= '&t=' . $data['topic_id']; } - $url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $params) . $add_anchor; + $url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx"; + $url = append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor; return $url; } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b970da2981..ae7365bcc2 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -137,7 +137,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_guests INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_time', '5'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_onlinetrack', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_user_activity', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1');