diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-03-04 00:22:15 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-03-04 00:22:15 +0100 |
| commit | d26ad8ed2693b03a12eec4deec729e972579e5d9 (patch) | |
| tree | 5e5089616cc4b398c1c698154ff5fdac8f6d1476 /phpBB/report.php | |
| parent | 8a9e1ca3f176946bc7b8ddb9be30ca8607685b80 (diff) | |
| parent | bee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff) | |
| download | forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.gz forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.bz2 forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.xz forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/report.php')
| -rw-r--r-- | phpBB/report.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/report.php b/phpBB/report.php index be38bad2f3..ce9fae13ef 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -180,6 +180,8 @@ if ($submit && $reason_id) $db->sql_query($sql); $report_id = $db->sql_nextid(); + $phpbb_notifications = $phpbb_container->get('notification_manager'); + if ($post_id) { $sql = 'UPDATE ' . POSTS_TABLE . ' @@ -198,6 +200,10 @@ if ($submit && $reason_id) $lang_return = $user->lang['RETURN_TOPIC']; $lang_success = $user->lang['POST_REPORTED_SUCCESS']; + + $phpbb_notifications->add_notifications('report_post', array_merge($report_data, $row, $forum_data, array( + 'report_text' => $report_text, + ))); } else { @@ -224,6 +230,12 @@ if ($submit && $reason_id) $lang_return = $user->lang['RETURN_PM']; $lang_success = $user->lang['PM_REPORTED_SUCCESS']; + + $phpbb_notifications->add_notifications('report_pm', array_merge($report_data, $row, array( + 'report_text' => $report_text, + 'from_user_id' => $report_data['author_id'], + 'report_id' => $report_id, + ))); } meta_refresh(3, $redirect_url); |