diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-18 16:43:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-18 16:43:46 +0200 |
| commit | b3fdf8a0463438e1e86979a5a4e50611228aea52 (patch) | |
| tree | 41c593c7fab580c5da71c7d881c7ec363a283013 /phpBB/viewforum.php | |
| parent | 4f3f4a40d66857f1db60d216f4a7070d74997918 (diff) | |
| parent | 51862f151dc34c6f15db5efb0d834891037d2a46 (diff) | |
| download | forums-b3fdf8a0463438e1e86979a5a4e50611228aea52.tar forums-b3fdf8a0463438e1e86979a5a4e50611228aea52.tar.gz forums-b3fdf8a0463438e1e86979a5a4e50611228aea52.tar.bz2 forums-b3fdf8a0463438e1e86979a5a4e50611228aea52.tar.xz forums-b3fdf8a0463438e1e86979a5a4e50611228aea52.zip | |
Merge remote-tracking branch 'EXreaction/ticket/8796' into develop
* EXreaction/ticket/8796:
[ticket/8796] Prevent setting post_time greater than time() in markread
[ticket/8796] Fix a few issues with the previous commits
[ticket/8796] Mark read links updated to include time() in url
[ticket/8796] Revert changes to $user->data['lastmark']
[ticket/8796] Make function markread obey the $post_time argument
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 03c2bb286f..83e5d4caa5 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -176,7 +176,7 @@ if ($mark_read == 'topics') $token = request_var('hash', ''); if (check_link_hash($token, 'global')) { - markread('topics', array($forum_id)); + markread('topics', array($forum_id), false, request_var('mark_time', 0)); } $redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); meta_refresh(3, $redirect_url); @@ -340,7 +340,7 @@ $template->assign_vars(array( 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '', 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '', 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start == 0) ? '' : "&start=$start")), - 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics") : '', + 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics&mark_time=" . time()) : '', )); // Grab icons |