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

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..

Browse source 
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
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
phpBB/admin/admin_forums.php
View file

@ -715,24 +715,29 @@ 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..
// This should end up in the template using IF...ELSE...ENDIF if ($forum_rows[$j]['cat_id'] == $cat_id)
// {
$row_color == "#DDDDDD" ? $row_color = "#CCCCCC" : $row_color = "#DDDDDD"; //
// This should end up in the template using IF...ELSE...ENDIF
$template->assign_block_vars("catrow.forumrow", array( //
"FORUM_NAME" => stripslashes($forum_rows[$j]['forum_name']), $row_color == "#DDDDDD" ? $row_color = "#CCCCCC" : $row_color = "#DDDDDD";
"FORUM_DESC" => stripslashes($forum_rows[$j]['forum_desc']),
"ROW_COLOR" => $row_color, $template->assign_block_vars("catrow.forumrow", array(
"NUM_TOPICS" => $forum_rows[$j]['forum_topics'], "FORUM_NAME" => stripslashes($forum_rows[$j]['forum_name']),
"NUM_POSTS" => $forum_rows[$j]['forum_posts'], "FORUM_DESC" => stripslashes($forum_rows[$j]['forum_desc']),
"U_VIEWFORUM" => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts']), "ROW_COLOR" => $row_color,
"FORUM_EDIT" => "<a href='".append_sid("$PHP_SELF?mode=editforum&forum_id=$forum_id")."'>Edit</a>", "NUM_TOPICS" => $forum_rows[$j]['forum_topics'],
"FORUM_DELETE" => "<a href='".append_sid("$PHP_SELF?mode=deleteforum&forum_id=$forum_id")."'>Delete</a>", "NUM_POSTS" => $forum_rows[$j]['forum_posts'],
"FORUM_UP" => "<a href='".append_sid("$PHP_SELF?mode=forum_order&move=-15&forum_id=$forum_id")."'>Move up</a>", "U_VIEWFORUM" => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts']),
"FORUM_DOWN" => "<a href='".append_sid("$PHP_SELF?mode=forum_order&move=15&forum_id=$forum_id")."'>Move down</a>", "FORUM_EDIT" => "<a href='".append_sid("$PHP_SELF?mode=editforum&forum_id=$forum_id")."'>Edit</a>",
"FORUM_SYNC" => "<a href='".append_sid("$PHP_SELF?mode=forum_sync&forum_id=$forum_id")."'>Sync</a>") "FORUM_DELETE" => "<a href='".append_sid("$PHP_SELF?mode=deleteforum&forum_id=$forum_id")."'>Delete</a>",
); "FORUM_UP" => "<a href='".append_sid("$PHP_SELF?mode=forum_order&move=-15&forum_id=$forum_id")."'>Move up</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>")
);
}// 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).'">