From b9308329cf3c0e6844a35f2d274423c2640887db Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 3 Sep 2012 18:37:54 -0500
Subject: [PATCH] [ticket/8796] Revert changes to $user->data['lastmark']

The earlier change might change the way some things work
(after looking at viewtopic) and I'd rather not risk introducing
new bugs, so I'm going to revert those changes to be safe.

PHPBB3-8796
---
 phpBB/includes/functions.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 53f48cb8a7..26b73e20fe 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1314,8 +1314,6 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 					WHERE user_id = {$user->data['user_id']}
 						AND mark_time < $post_time";
 				$db->sql_query($sql);
-
-				$user->data['user_lastmark'] = $post_time;
 			}
 			else if ($config['load_anon_lastread'] || $user->data['is_registered'])
 			{
@@ -1339,8 +1337,6 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 						WHERE user_id = {$user->data['user_id']}
 							AND mark_time < $post_time";
 					$db->sql_query($sql);
-
-					$user->data['user_lastmark'] = $post_time;
 				}
 			}
 		}
@@ -1524,13 +1520,13 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 
 				if ($user->data['is_registered'])
 				{
+					$user->data['user_lastmark'] = intval(base_convert(max($time_keys) + $config['board_startdate'], 36, 10));
+
 					$sql = 'UPDATE ' . USERS_TABLE . "
 						SET user_lastmark = $post_time
 						WHERE user_id = {$user->data['user_id']}
 							AND mark_time < $post_time";
 					$db->sql_query($sql);
-
-					$user->data['user_lastmark'] = $post_time;
 				}
 				else
 				{