diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-09-22 13:32:28 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-09-22 13:32:28 +0000 |
| commit | 08428f8fa133c43c05066ff0e307abe01d943fa0 (patch) | |
| tree | 6fd52c4b643026b0b1f82f172032f8b45513e7a6 /phpBB/viewforum.php | |
| parent | 0f14f278d0fa9d765bb141ab79242a34fa73a883 (diff) | |
| download | forums-08428f8fa133c43c05066ff0e307abe01d943fa0.tar forums-08428f8fa133c43c05066ff0e307abe01d943fa0.tar.gz forums-08428f8fa133c43c05066ff0e307abe01d943fa0.tar.bz2 forums-08428f8fa133c43c05066ff0e307abe01d943fa0.tar.xz forums-08428f8fa133c43c05066ff0e307abe01d943fa0.zip | |
merging 8904
git-svn-id: file:///svn/phpbb/trunk@8905 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index e0fb0ec621..f41e1abb08 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -173,8 +173,11 @@ if (!$auth->acl_get('f_read', $forum_id)) // Handle marking posts if ($mark_read == 'topics') { - markread('topics', $forum_id); - + $token = request_var('hash', ''); + if (check_link_hash($token, 'global')) + { + markread('topics', $forum_id); + } $redirect_url = append_sid('viewforum', 'f=' . $forum_id); meta_refresh(3, $redirect_url); @@ -303,11 +306,11 @@ $template->assign_vars(array( 'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true, 'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false, 'S_VIEWFORUM' => true, - + 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid('mcp', "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('posting', 'mode=post&f=' . $forum_id) : '', 'U_VIEW_FORUM' => append_sid('viewforum', "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . "&start=$start"), - 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid('viewforum', "f=$forum_id&mark=topics") : '', + 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid('viewforum', 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics") : '', )); // Grab icons |