diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:28:55 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:28:55 -0400 |
| commit | 26326937f2523f1464e1d2bb66db1318cace71b3 (patch) | |
| tree | 2e7e490033a990ec0054c69b3c008918f5771be0 | |
| parent | ee12a66c74321e2d6e4da679cce92496747802f8 (diff) | |
| parent | d80be455b953e7d7cb0670dc2412e28944938e9f (diff) | |
| download | forums-26326937f2523f1464e1d2bb66db1318cace71b3.tar forums-26326937f2523f1464e1d2bb66db1318cace71b3.tar.gz forums-26326937f2523f1464e1d2bb66db1318cace71b3.tar.bz2 forums-26326937f2523f1464e1d2bb66db1318cace71b3.tar.xz forums-26326937f2523f1464e1d2bb66db1318cace71b3.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10266] Add "Return to forum" link after reporting a post
| -rw-r--r-- | phpBB/report.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/report.php b/phpBB/report.php index a30914392b..45c1962370 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -39,11 +39,13 @@ if (!$post_id && (!$pm_id || !$config['allow_pm_report'])) if ($post_id) { $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&p=$post_id") . "#p$post_id"; + $return_forum_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"); $pm_id = 0; } else { $redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&p=$pm_id"); + $return_forum_url = ''; $post_id = 0; $forum_id = 0; } @@ -101,6 +103,7 @@ if ($post_id) { $message = $user->lang['ALREADY_REPORTED']; $message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>'); + $message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>'); trigger_error($message); } } @@ -209,6 +212,10 @@ if ($submit && $reason_id) meta_refresh(3, $redirect_url); $message = $lang_success . '<br /><br />' . sprintf($lang_return, '<a href="' . $redirect_url . '">', '</a>'); + if ($return_forum_url) + { + $message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>'); + } trigger_error($message); } |