diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-09-03 18:37:54 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-09-03 18:37:54 -0500 |
| commit | b9308329cf3c0e6844a35f2d274423c2640887db (patch) | |
| tree | 99f3d0388f109a5d182d4fa2ce2726acd271686c /phpBB | |
| parent | 815cc4a9a3fa8c633b55925eb77f9f3bdbb5de04 (diff) | |
| download | forums-b9308329cf3c0e6844a35f2d274423c2640887db.tar forums-b9308329cf3c0e6844a35f2d274423c2640887db.tar.gz forums-b9308329cf3c0e6844a35f2d274423c2640887db.tar.bz2 forums-b9308329cf3c0e6844a35f2d274423c2640887db.tar.xz forums-b9308329cf3c0e6844a35f2d274423c2640887db.zip | |
[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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files 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 { |