diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:53 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:34:53 +0100 |
| commit | 1b003fd244a9377731f118b62850861210d0a9b0 (patch) | |
| tree | ff313a530379df6d623604af1b2d39975cdeb16c /phpBB/ucp.php | |
| parent | d3a1b670bd555c33ccbea4c7f58ac404e294381b (diff) | |
| parent | 0a5d2a84d158e23b1d2e724d569c183bb049892e (diff) | |
| download | forums-1b003fd244a9377731f118b62850861210d0a9b0.tar forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.gz forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.bz2 forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.xz forums-1b003fd244a9377731f118b62850861210d0a9b0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/8616] Include old U_INBOX var for BC
[ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
[ticket/8616] Direct links in pm notification emails
Diffstat (limited to 'phpBB/ucp.php')
| -rw-r--r-- | phpBB/ucp.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 4ec5d01fe0..505dbb998b 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -256,6 +256,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']); } |