2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 26b73e20fe..13cb15d73d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1305,14 +1305,14 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 				{
 					$sql = 'DELETE FROM ' . $table . "
 						WHERE user_id = {$user->data['user_id']}
-							AND mark_time <  . $post_time";
+							AND mark_time < $post_time";
 					$db->sql_query($sql);
 				}
 
 				$sql = 'UPDATE ' . USERS_TABLE . "
 					SET user_lastmark = $post_time
 					WHERE user_id = {$user->data['user_id']}
-						AND mark_time < $post_time";
+						AND user_lastmark < $post_time";
 				$db->sql_query($sql);
 			}
 			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 . "
 						SET user_lastmark = $post_time
 						WHERE user_id = {$user->data['user_id']}
-							AND mark_time < $post_time";
+							AND user_lastmark < $post_time";
 					$db->sql_query($sql);
 				}
 			}
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index e9c7143473..39ec8445c5 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -54,7 +54,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 	// Handle marking everything read
 	if ($mark_read == 'all')
 	{
-		$redirect = build_url(array('mark', 'hash'));
+		$redirect = build_url(array('mark', 'hash', 'mark_time'));
 		meta_refresh(3, $redirect);
 
 		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
 	if ($mark_read == 'forums')
 	{
-		$redirect = build_url(array('mark', 'hash'));
+		$redirect = build_url(array('mark', 'hash', 'mark_time'));
 		$token = request_var('hash', '');
 		if (check_link_hash($token, 'global'))
 		{