aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/report.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-07-14 02:52:05 +0200
committerJoas Schilling <nickvergessen@gmx.de>2011-07-14 02:52:05 +0200
commit1ff0f221faaf40d742e7dc6d6947e62fe6d89268 (patch)
tree742bbc30b7ae90b7b35b9fde0e5c6e3e335626eb /phpBB/report.php
parente4707a8be75263e610b00b3d600144e797f576d9 (diff)
downloadforums-1ff0f221faaf40d742e7dc6d6947e62fe6d89268.tar
forums-1ff0f221faaf40d742e7dc6d6947e62fe6d89268.tar.gz
forums-1ff0f221faaf40d742e7dc6d6947e62fe6d89268.tar.bz2
forums-1ff0f221faaf40d742e7dc6d6947e62fe6d89268.tar.xz
forums-1ff0f221faaf40d742e7dc6d6947e62fe6d89268.zip
[ticket/10266] Add "Return to forum" link after reporting a post
PHPBB3-10266
Diffstat (limited to 'phpBB/report.php')
-rw-r--r--phpBB/report.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/report.php b/phpBB/report.php
index ca8c7bbd0e..c1172ec1d5 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&amp;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);
}