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

Merge branch '3.2.x' into 3.3.x

Browse source
This commit is contained in:
Marc Alexander 2020-05-24 14:07:37 +02:00
commit aae5852ad3
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/mcp/mcp_warn.php
View file

@ -572,11 +572,12 @@ function add_warning($user_row, $warning, $send_pm = true, $post_id = 0)
submit_pm('post', $warn_pm_subject, $pm_data, false); submit_pm('post', $warn_pm_subject, $pm_data, false);
} }
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_WARNING', false, array($user_row['username'])); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_WARNING', false, [$user_row['username']]);
$log_id = $phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_WARNING_BODY', false, array(
$log_id = $phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_WARNING_BODY', false, [
'reportee_id' => $user_row['user_id'], 'reportee_id' => $user_row['user_id'],
$warning utf8_encode_ucr($warning)
)); ]);
$sql_ary = array( $sql_ary = array(
'user_id' => $user_row['user_id'], 'user_id' => $user_row['user_id'],