diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-22 20:16:18 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-22 20:16:18 +0000 |
| commit | 4be10373b84013f46a7ecb97059dd0dcfd7a9b5e (patch) | |
| tree | 537b05f11064dc5276df260514a5d6a02f29cbab /phpBB/viewforum.php | |
| parent | 2005fb7061f7a7828dd2e49ac5f3d641b6f525fd (diff) | |
| download | forums-4be10373b84013f46a7ecb97059dd0dcfd7a9b5e.tar forums-4be10373b84013f46a7ecb97059dd0dcfd7a9b5e.tar.gz forums-4be10373b84013f46a7ecb97059dd0dcfd7a9b5e.tar.bz2 forums-4be10373b84013f46a7ecb97059dd0dcfd7a9b5e.tar.xz forums-4be10373b84013f46a7ecb97059dd0dcfd7a9b5e.zip | |
Merged forum nav for viewtopic/viewforum, fixed cache behavior with an empty icons table.
git-svn-id: file:///svn/phpbb/trunk@3359 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index cf091624b9..91803c18e8 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -96,53 +96,8 @@ if (!$auth->acl_gets('f_read', 'm_', 'a_', $forum_id)) } // End of auth check -// Get forum parents -$forum_parents = array(); -if ($forum_data['parent_id'] > 0) -{ - if (empty($forum_data['forum_parents'])) - { - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE . ' - WHERE left_id < ' . $forum_data['left_id'] . ' - AND right_id > ' . $forum_data['right_id'] . ' - ORDER BY left_id ASC'; - - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $forum_parents[$row['forum_id']] = $row['forum_name']; - } - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET forum_parents = '" . sql_escape(serialize($forum_parents)) . "' - WHERE parent_id = " . $forum_data['parent_id']; - $db->sql_query($sql); - } - else - { - $forum_parents = unserialize($forum_data['forum_parents']); - } -} - // Build navigation links -foreach ($forum_parents as $parent_forum_id => $parent_name) -{ - $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $parent_name, - 'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $parent_forum_id - )); -} -$template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $forum_data['forum_name'], - 'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id -)); - -$template->assign_vars(array( - 'FORUM_ID' => $forum_id, - 'FORUM_NAME' => $forum_data['forum_name'], - 'FORUM_DESC' => strip_tags($forum_data['forum_desc']) -)); +generate_forum_nav($forum_data); // Moderators $forum_moderators = array(); |