mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
[ticket/11484] Display login box for users following email notification link.
The link used for the latest post now uses view=unread so redirecting the user using the value for the e parameter is no longer necessary. PHPBB3-11484
This commit is contained in:
@@ -347,23 +347,10 @@ if ($topic_data['forum_password'])
|
||||
login_forum_box($topic_data);
|
||||
}
|
||||
|
||||
// Redirect to login or to the correct post upon emailed notification links
|
||||
if (isset($_GET['e']))
|
||||
// Redirect to login upon emailed notification links if user is not logged in.
|
||||
if (isset($_GET['e']) && $user->data['user_id'] == ANONYMOUS)
|
||||
{
|
||||
$jump_to = request_var('e', 0);
|
||||
|
||||
$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id");
|
||||
|
||||
if ($user->data['user_id'] == ANONYMOUS)
|
||||
{
|
||||
login_box($redirect_url . "&p=$post_id&e=$jump_to", $user->lang['LOGIN_NOTIFY_TOPIC']);
|
||||
}
|
||||
|
||||
if ($jump_to > 0)
|
||||
{
|
||||
// We direct the already logged in user to the correct post...
|
||||
redirect($redirect_url . ((!$post_id) ? "&p=$jump_to" : "&p=$post_id") . "#p$jump_to");
|
||||
}
|
||||
login_box(build_url('e') . '#unread', $user->lang['LOGIN_NOTIFY_TOPIC']);
|
||||
}
|
||||
|
||||
// What is start equal to?
|
||||
|
Reference in New Issue
Block a user