mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2021-08-23 20:30:14 +02:00
parent 791632a5c8 acbcb18226
commit 72cf2ba2ea
39 changed files with 288 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/mcp/mcp_warn.php
View File

@@ -238,10 +238,10 @@ class mcp_warn
$user_id = $user_row['user_id'];
if (strpos($this->u_action, "&f=$forum_id&p=$post_id") === false)
if (strpos($this->u_action, "&p=$post_id") === false)
{
$this->p_master->adjust_url("&f=$forum_id&p=$post_id");
$this->u_action .= "&f=$forum_id&p=$post_id";
$this->p_master->adjust_url("&p=$post_id");
$this->u_action .= "&p=$post_id";
}
// Check if can send a notification
@@ -362,7 +362,7 @@ class mcp_warn
'RANK_IMG' => $user_rank_data['img'],
'L_WARNING_POST_DEFAULT' => sprintf($user->lang['WARNING_POST_DEFAULT'], generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&p=$post_id#p$post_id"),
'L_WARNING_POST_DEFAULT' => sprintf($user->lang['WARNING_POST_DEFAULT'], generate_board_url() . "/viewtopic.$phpEx?p=$post_id#p$post_id"),
'S_CAN_NOTIFY' => $s_can_notify,
));