Fix for part of bug 460308. We weren't checking if the forum belonged to the current cat before we drew it under that cat..

git-svn-id: file:///svn/phpbb/trunk@1028 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
natec 2001-09-11 04:03:00 +00:00
parent 604d939d8d
commit b2ce7e4e7f

View file

@ -715,6 +715,9 @@ if($total_categories = $db->sql_numrows($q_categories))
{ {
$forum_id = $forum_rows[$j]['forum_id']; $forum_id = $forum_rows[$j]['forum_id'];
// Don't display this forum unless it's in this category..
if ($forum_rows[$j]['cat_id'] == $cat_id)
{
// //
// This should end up in the template using IF...ELSE...ENDIF // This should end up in the template using IF...ELSE...ENDIF
// //
@ -733,6 +736,8 @@ if($total_categories = $db->sql_numrows($q_categories))
"FORUM_DOWN" => "<a href='".append_sid("$PHP_SELF?mode=forum_order&move=15&forum_id=$forum_id")."'>Move down</a>", "FORUM_DOWN" => "<a href='".append_sid("$PHP_SELF?mode=forum_order&move=15&forum_id=$forum_id")."'>Move down</a>",
"FORUM_SYNC" => "<a href='".append_sid("$PHP_SELF?mode=forum_sync&forum_id=$forum_id")."'>Sync</a>") "FORUM_SYNC" => "<a href='".append_sid("$PHP_SELF?mode=forum_sync&forum_id=$forum_id")."'>Sync</a>")
); );
}// if ... forumid == catid
} // for ... forums } // for ... forums
$template->assign_block_vars("catrow.forumrow", array( $template->assign_block_vars("catrow.forumrow", array(
"S_ADDFORUM" => '<FORM METHOD="POST" ACTION="'.append_sid($PHP_SELF).'"> "S_ADDFORUM" => '<FORM METHOD="POST" ACTION="'.append_sid($PHP_SELF).'">