fixed redirect for first cookie setting...

git-svn-id: file:///svn/phpbb/trunk@4917 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2004-06-24 08:02:15 +00:00
parent 5cb3baf33b
commit ca1b45581b

View file

@ -72,7 +72,7 @@ else
if (!isset($tracking_topics[$forum_id]) && $user->data['user_id'] != ANONYMOUS) if (!isset($tracking_topics[$forum_id]) && $user->data['user_id'] != ANONYMOUS)
{ {
markread('mark', $forum_id); markread('mark', $forum_id);
redirect(str_replace('&', '&', htmlspecialchars((!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : $_ENV['REQUEST_URI']))); redirect("viewforum.$phpEx$SID&f=$forum_id");
} }
} }
@ -499,6 +499,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
} }
// Goto message generation // Goto message generation
// Note: Template this a little bit more to allow style authors seperating goto_page, next, prev and pagination block?
if (($replies + 1) > $config['posts_per_page']) if (($replies + 1) > $config['posts_per_page'])
{ {
$total_pages = ceil(($replies + 1) / $config['posts_per_page']); $total_pages = ceil(($replies + 1) / $config['posts_per_page']);
@ -516,7 +517,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
} }
else if ($times < $total_pages) else if ($times < $total_pages)
{ {
$goto_page .= ', '; $goto_page .= $user->theme['primary']['pagination_sep'];
} }
$times++; $times++;
} }