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

Very minor changes.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3317 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-01-13 06:44:16 +00:00
parent ab928d8f5f
commit b2721cca0c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/functions_display.php
View file

@ -33,6 +33,9 @@ function display_forums($root_data=array(), $display_moderators=TRUE)
lr.user_id = " . $user->data['user_id'] . " lr.user_id = " . $user->data['user_id'] . "
AND (f.forum_id = lr.forum_id OR f.forum_id = -lr.forum_id) AND (f.forum_id = lr.forum_id OR f.forum_id = -lr.forum_id)
AND lr.lastread_time >= f.forum_last_post_time)"; AND lr.lastread_time >= f.forum_last_post_time)";
// Temp fix
$where_sql .= ' GROUP BY f.forum_id';
} }
else else
{ {
@ -189,7 +192,7 @@ function display_forums($root_data=array(), $display_moderators=TRUE)
} }
$subforums_list = implode(', ', $links); $subforums_list = implode(', ', $links);
$l_subforums = (count($subforums[$forum_id]) == 1) ? $user->lang['Subforum'] . ': ' : $user->lang['Subforums'] . ': '; $l_subforums = (count($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': ';
} }
else else
{ {
@ -198,13 +201,10 @@ function display_forums($root_data=array(), $display_moderators=TRUE)
} }
$l_moderator = $moderators_list = ''; $l_moderator = $moderators_list = '';
if ($display_moderators) if ($display_moderators && !empty($forum_moderators[$forum_id]))
{ {
if (!empty($forum_moderators[$forum_id])) $l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['MODERATOR'] : $user->lang['MODERATORS'];
{ $moderators_list = implode(', ', $forum_moderators[$forum_id]);
$l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] : $user->lang['Moderators'];
$moderators_list = implode(', ', $forum_moderators[$forum_id]);
}
} }
$template->assign_block_vars('forumrow', array( $template->assign_block_vars('forumrow', array(
@ -222,8 +222,8 @@ function display_forums($root_data=array(), $display_moderators=TRUE)
'FORUM_IMG' => $forum_image, 'FORUM_IMG' => $forum_image,
'L_SUBFORUM' => $l_subforums, 'L_SUBFORUM_STR' => $l_subforums,
'L_MODERATOR' => $l_moderator, 'L_MODERATOR_STR' => $l_moderator,
'L_FORUM_FOLDER_ALT'=> $folder_alt, 'L_FORUM_FOLDER_ALT'=> $folder_alt,
'U_VIEWFORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $row['forum_id'] 'U_VIEWFORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $row['forum_id']

2
phpBB/index.php
View file

@ -137,4 +137,4 @@ $template->set_filenames(array(
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?> ?>