makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16138] Resolve misc coding style issues

Browse source 
PHPBB3-16138
This commit is contained in:
Marc Alexander 2021-05-19 22:11:01 +02:00
parent d05abc0807
commit 6a0b1333da
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/posting.php
View file

@ -73,6 +73,7 @@ switch ($mode)
$forum_id = (int) $db->sql_fetchfield('forum_id'); $forum_id = (int) $db->sql_fetchfield('forum_id');
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
if (!$topic_id || !$forum_id) if (!$topic_id || !$forum_id)
{ {
trigger_error('NO_TOPIC'); trigger_error('NO_TOPIC');
@ -1841,23 +1842,23 @@ $s_action = append_sid("{$phpbb_root_path}posting.$phpEx", "mode=$mode");
switch ($mode) switch ($mode)
{ {
case 'post': case 'post':
$s_action .= ($forum_id) ? "&f=$forum_id" : ''; $s_action .= $forum_id ? "&f=$forum_id" : '';
$page_title = $user->lang['POST_TOPIC']; $page_title = $user->lang['POST_TOPIC'];
break; break;
case 'reply': case 'reply':
$s_action .= ($topic_id) ? "&t=$topic_id" : ''; $s_action .= $topic_id ? "&t=$topic_id" : '';
$page_title = $user->lang['POST_REPLY']; $page_title = $user->lang['POST_REPLY'];
break; break;
case 'quote': case 'quote':
$s_action .= ($post_id) ? "&p=$post_id" : ''; $s_action .= $post_id ? "&p=$post_id" : '';
$page_title = $user->lang['POST_REPLY']; $page_title = $user->lang['POST_REPLY'];
break; break;
case 'delete': case 'delete':
case 'edit': case 'edit':
$s_action .= ($post_id) ? "&p=$post_id" : ''; $s_action .= $post_id ? "&p=$post_id" : '';
$page_title = $user->lang['EDIT_POST']; $page_title = $user->lang['EDIT_POST'];
break; break;
} }

6
tests/test_framework/phpbb_functional_test_case.php
View file

@ -1146,7 +1146,7 @@ class phpbb_functional_test_case extends phpbb_test_case
'subject' => $subject, 'subject' => $subject,
'message' => $message, 'message' => $message,
'post' => true, 'post' => true,
'topic_id' => $topic_id, 'topic_id' => $topic_id,
), $additional_form_data); ), $additional_form_data);
return self::submit_post($posting_url, 'POST_REPLY', $form_data, $expected); return self::submit_post($posting_url, 'POST_REPLY', $form_data, $expected);
@ -1182,8 +1182,8 @@ class phpbb_functional_test_case extends phpbb_test_case
$url = $crawler->selectLink($form_data['subject'])->link()->getUri(); $url = $crawler->selectLink($form_data['subject'])->link()->getUri();
$topic_id = $this->get_parameter_from_link($url, 't'); $topic_id = $this->get_parameter_from_link($url, 't');
if (!$topic_id) if (!$topic_id)
{ {
$topic_id = $form_data['topic_id']; $topic_id = $form_data['topic_id'];
} }