diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-16 21:30:52 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-16 21:30:52 +0200 |
| commit | c89384eb86c0d2ff89f9df69dbd14fb61cfcb624 (patch) | |
| tree | 98bac3192ed32ea6483c33a77aadc1c1f95200cf /phpBB/includes/ucp | |
| parent | f077b72d0ddabd13350bea276069b68d5df4a89c (diff) | |
| parent | a089ff5eb0dcdab83c6c2e64cb0e7cb618aec41f (diff) | |
| download | forums-c89384eb86c0d2ff89f9df69dbd14fb61cfcb624.tar forums-c89384eb86c0d2ff89f9df69dbd14fb61cfcb624.tar.gz forums-c89384eb86c0d2ff89f9df69dbd14fb61cfcb624.tar.bz2 forums-c89384eb86c0d2ff89f9df69dbd14fb61cfcb624.tar.xz forums-c89384eb86c0d2ff89f9df69dbd14fb61cfcb624.zip | |
Merge pull request #3446 from MateBartus/ticket/13654
[ticket/13654] Moving reporting into controller
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 52948cea19..44564ed562 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -232,7 +232,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', 'U_EMAIL' => $user_info['email'], - 'U_REPORT' => ($config['allow_pm_report']) ? append_sid("{$phpbb_root_path}report.$phpEx", "pm=" . $message_row['msg_id']) : '', + 'U_REPORT' => ($config['allow_pm_report']) ? $phpbb_container->get('controller.helper')->route('phpbb_report_pm_controller', array('id' => $message_row['msg_id'])) : '', 'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=quote&f=$folder_id&p=" . $message_row['msg_id'] : '', 'U_EDIT' => (($message_row['message_time'] > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && $auth->acl_get('u_pm_edit')) ? "$url&mode=compose&action=edit&f=$folder_id&p=" . $message_row['msg_id'] : '', 'U_POST_REPLY_PM' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $message_row['msg_id'] : '', |