makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16138] Remove extra variables and improve fallback to viewforum

Browse source 
PHPBB3-16138
This commit is contained in:
Marc Alexander 2021-08-04 21:44:49 +02:00
parent c925e8ef58
commit 3f9e6c6013
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/includes/functions_posting.php
View file

@ -2543,25 +2543,32 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
$params = []; $params = [];
$add_anchor = ''; $add_anchor = '';
$url = "{$phpbb_root_path}viewtopic.$phpEx";
if ($post_visibility == ITEM_APPROVED || if ($post_visibility == ITEM_APPROVED ||
($auth->acl_get('m_softdelete', $data_ary['forum_id']) && $post_visibility == ITEM_DELETED) || ($auth->acl_get('m_softdelete', $data_ary['forum_id']) && $post_visibility == ITEM_DELETED) ||
($auth->acl_get('m_approve', $data_ary['forum_id']) && in_array($post_visibility, array(ITEM_UNAPPROVED, ITEM_REAPPROVE)))) ($auth->acl_get('m_approve', $data_ary['forum_id']) && in_array($post_visibility, array(ITEM_UNAPPROVED, ITEM_REAPPROVE))))
{ {
$params['t'] = $data_ary['topic_id'];
if ($mode != 'post') if ($mode != 'post')
{ {
$params['p'] = $data_ary['post_id']; $params['p'] = $data_ary['post_id'];
$add_anchor = '#p' . $data_ary['post_id']; $add_anchor = '#p' . $data_ary['post_id'];
} }
else
{
$params['t'] = $data_ary['topic_id'];
}
} }
else if ($mode != 'post' && $post_mode != 'edit_first_post' && $post_mode != 'edit_topic') else if ($mode != 'post' && $post_mode != 'edit_first_post' && $post_mode != 'edit_topic')
{ {
$params['t'] = $data_ary['topic_id']; $params['t'] = $data_ary['topic_id'];
} }
else
{
$url = "{$phpbb_root_path}viewforum.$phpEx";
$params['f'] = $data_ary['forum_id'];
}
$url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx";
$url = append_sid($url, $params) . $add_anchor; $url = append_sid($url, $params) . $add_anchor;
$poll = $poll_ary; $poll = $poll_ary;