diff options
| author | David King <imkingdavid@gmail.com> | 2013-02-28 18:53:23 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-02-28 18:53:23 -0500 |
| commit | 8200509c7940166d560c309c35b2ade2e4952f75 (patch) | |
| tree | 5f4e89b1fe677520a4310754860a9c85511bb2b0 /phpBB/report.php | |
| parent | 1eead4da97635df35bfcdd6b1ce7ed71d9851d41 (diff) | |
| parent | ecb9f44bf11756e1072354bfd658edfd4c01f74a (diff) | |
| download | forums-8200509c7940166d560c309c35b2ade2e4952f75.tar forums-8200509c7940166d560c309c35b2ade2e4952f75.tar.gz forums-8200509c7940166d560c309c35b2ade2e4952f75.tar.bz2 forums-8200509c7940166d560c309c35b2ade2e4952f75.tar.xz forums-8200509c7940166d560c309c35b2ade2e4952f75.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11103' into develop
# By Nathan Guse (169) and others
# Via Nathan Guse (29) and Nathaniel Guse (7)
* EXreaction/ticket/11103: (217 commits)
[ticket/11103] Revert whitespace changes
[ticket/11103] Few more minor language things
[ticket/11103] Don't call generate_board_url many times
[ticket/11103] Case time in queries as an int
[ticket/11103] Fix effectively installed check
[ticket/11103] Remove padding from notifications for now.
[ticket/11103] Notifications Migration file
[ticket/11103] Restore new/unread messages info/link in header (properly)
[ticket/11103] Add newlines to bottom of css file
[ticket/11103] HTML encode double arrow character
[ticket/11103] Add Notification Settings link in flyout menu
[ticket/11103] Restore new/unread messages info/link in header
[ticket/11103] Update styling of UCP Notifications in subsilver2
[ticket/11103] Update styling of UCP Notifications in prosilver
[ticket/11103] Update styling of subsilver2 notification modal
[ticket/11103] Update styling of prosilver notification modal
[ticket/11103] Remove title attribute from notification link
[ticket/11103] Mark/Unmark All buttons
[ticket/11103] Make the number of notifications strong if > 0
[ticket/11103] Rounded Corners and antialiased pointer
...
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); |