mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-02 12:53:37 +02:00
Code Issues Releases Wiki Activity

Minor bugfix (subforums template was called even if there only were empty subcats).

Browse Source 
Jumpbox got its "Select a forum" entry back.


git-svn-id: file:///svn/phpbb/trunk@2952 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud
2002-10-11 02:24:00 +00:00
parent 58ddae0c90
commit 1e52eafc80
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/viewforum.php
View File

@@ -96,6 +96,7 @@ if (!$auth->acl_get('f_read', $forum_id))
$type = 'parent';
$forum_rows = array();
$s_has_subforums = FALSE;
foreach ($forum_branch as $row)
{
if ($type == 'parent')
@@ -133,12 +134,21 @@ foreach ($forum_branch as $row)
{
$branch_root_id = $row['forum_id'];
}
else
{
$s_has_subforums = TRUE;
}
}
elseif ($row['parent_id'] == $branch_root_id)
{
// Forum directly under a category
$forum_rows[] = $row;
$parent_id = $row['forum_id'];
if ($row['forum_status'] != ITEM_CATEGORY)
{
$s_has_subforums = TRUE;
}
}
elseif ($row['forum_status'] != ITEM_CATEGORY)
{
@@ -337,7 +347,7 @@ $template->assign_vars(array(
//
// Do we have subforums? if so, let's include this harmless file
//
if (count($forum_rows))
if ($s_has_subforums)
{
$template->assign_vars(array(
'S_HAS_SUBFORUM' => TRUE,