makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 21:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/8796] Fix a few issues with the previous commits

Browse source 
Fix an SQL error and the redirect url generated

PHPBB3-8796
This commit is contained in:
Nathaniel Guse 2012-09-03 18:58:38 -05:00
parent 9cba0b5263
commit fccbf09e4a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/functions.php
View file

@ -1305,14 +1305,14 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
{ {
$sql = 'DELETE FROM ' . $table . " $sql = 'DELETE FROM ' . $table . "
WHERE user_id = {$user->data['user_id']} WHERE user_id = {$user->data['user_id']}
AND mark_time < . $post_time"; AND mark_time < $post_time";
$db->sql_query($sql); $db->sql_query($sql);
} }
$sql = 'UPDATE ' . USERS_TABLE . " $sql = 'UPDATE ' . USERS_TABLE . "
SET user_lastmark = $post_time SET user_lastmark = $post_time
WHERE user_id = {$user->data['user_id']} WHERE user_id = {$user->data['user_id']}
AND mark_time < $post_time"; AND user_lastmark < $post_time";
$db->sql_query($sql); $db->sql_query($sql);
} }
else if ($config['load_anon_lastread'] || $user->data['is_registered']) else if ($config['load_anon_lastread'] || $user->data['is_registered'])
@ -1335,7 +1335,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
$sql = 'UPDATE ' . USERS_TABLE . " $sql = 'UPDATE ' . USERS_TABLE . "
SET user_lastmark = $post_time SET user_lastmark = $post_time
WHERE user_id = {$user->data['user_id']} WHERE user_id = {$user->data['user_id']}
AND mark_time < $post_time"; AND user_lastmark < $post_time";
$db->sql_query($sql); $db->sql_query($sql);
} }
} }

4
phpBB/includes/functions_display.php
View file

@ -54,7 +54,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
// Handle marking everything read // Handle marking everything read
if ($mark_read == 'all') if ($mark_read == 'all')
{ {
$redirect = build_url(array('mark', 'hash')); $redirect = build_url(array('mark', 'hash', 'mark_time'));
meta_refresh(3, $redirect); meta_refresh(3, $redirect);
if (check_link_hash(request_var('hash', ''), 'global')) if (check_link_hash(request_var('hash', ''), 'global'))
@ -305,7 +305,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
// Handle marking posts // Handle marking posts
if ($mark_read == 'forums') if ($mark_read == 'forums')
{ {
$redirect = build_url(array('mark', 'hash')); $redirect = build_url(array('mark', 'hash', 'mark_time'));
$token = request_var('hash', ''); $token = request_var('hash', '');
if (check_link_hash($token, 'global')) if (check_link_hash($token, 'global'))
{ {