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/index.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/index.php')
| -rw-r--r-- | phpBB/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/index.php b/phpBB/index.php index 0ac8034d7f..66e1b2114b 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -167,7 +167,7 @@ $template->assign_vars(array( 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), 'S_DISPLAY_BIRTHDAY_LIST' => ($config['load_birthdays']) ? true : false, - 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums') : '', + 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : '', 'U_MCP' => ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=front', true, $user->session_id) : '') ); |