diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 18:23:22 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 18:23:22 -0500 |
| commit | 3f27890a5e78849582cb1ffec485ee3492671837 (patch) | |
| tree | 2674de10a4162d90e580b27b057204b2eddc136c /phpBB/index.php | |
| parent | 4b3264d9bbe81cec987fc6d01b7d12d29585654e (diff) | |
| parent | b3fdf8a0463438e1e86979a5a4e50611228aea52 (diff) | |
| download | forums-3f27890a5e78849582cb1ffec485ee3492671837.tar forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.gz forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.bz2 forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.xz forums-3f27890a5e78849582cb1ffec485ee3492671837.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/includes/functions.php
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 3cb49f1a28..ac886be0ff 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -189,7 +189,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) : '') ); |