diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-01-25 21:01:52 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-01-25 21:01:52 +0000 |
| commit | 90385cd79a550b4ac08e10e3b8a01abc37965bd4 (patch) | |
| tree | 87838a4580032f81b981a0867cd2b766d3d81ab6 /phpBB/includes/functions_display.php | |
| parent | 964615eb0799b2d20d9578af9e328fb1a348d8da (diff) | |
| download | forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar.gz forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar.bz2 forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.tar.xz forums-90385cd79a550b4ac08e10e3b8a01abc37965bd4.zip | |
- moved add_log out of functions_admin (this file should only be included in admin/admin-related pages)
- fixed cookie based topic tracking
- added missing config variables
- other minor things
git-svn-id: file:///svn/phpbb/trunk@5494 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 6f76c0144e..628bb8e9f5 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -46,7 +46,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod // Display list of active topics for this category? $show_active = (isset($root_data['forum_flags']) && $root_data['forum_flags'] & 16) ? true : false; - if ($config['load_db_track'] && $user->data['is_registered']) + if ($config['load_db_lastread'] && $user->data['is_registered']) { $sql_from = FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id)'; $lastread_select = ', ft.mark_time '; @@ -117,6 +117,10 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod } else { + if (!$user->data['is_registered']) + { + $user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate'] : 0; + } $forum_tracking_info[$forum_id] = (isset($tracking_topics['f'][$forum_id])) ? base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate'] : $user->data['user_lastmark']; } |