aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan <asinshesq@code.phpbb.com>2011-10-13 19:17:56 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-10-13 19:17:56 +0200
commitf7c1341402ea47cc33ac183421485db3efd7ea15 (patch)
tree1f11a3b44aaa390d2faa221cd21beefeda00db0c /phpBB/ucp.php
parentMerge remote-tracking branch 'igorw/ticket/8094' into develop-olympus (diff)
downloadphpbb-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.gz
phpbb-f7c1341402ea47cc33ac183421485db3efd7ea15.tar.bz2
phpbb-f7c1341402ea47cc33ac183421485db3efd7ea15.zip
[ticket/8616] Direct links in pm notification emails
Import the "Direct links in pm notification emails" modification, version 1.0.1. PHPBB3-8616
Diffstat (limited to 'phpBB/ucp.php')
-rw-r--r--phpBB/ucp.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 8fa022668b..45caeb12ea 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -254,6 +254,12 @@ if (!$user->data['is_registered'])
redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
}
+ if ($id == 'pm' && $mode == 'view' && isset($_GET['p']))
+ {
+ $redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx?i=pm&p=" . request_var('p', 0));
+ login_box($redirect_url, $user->lang['LOGIN_EXPLAIN_UCP']);
+ }
+
login_box('', $user->lang['LOGIN_EXPLAIN_UCP']);
}