diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-17 17:47:41 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-17 17:47:41 +0000 |
| commit | 3b907d8642f3274fddc6563d192f073acee7b6db (patch) | |
| tree | f157cc1bd55946a9a87147300355319d7f45419a /phpBB/includes/functions.php | |
| parent | e2c2953245551be56cbca8ec3e9d7055d58933c0 (diff) | |
| download | forums-3b907d8642f3274fddc6563d192f073acee7b6db.tar forums-3b907d8642f3274fddc6563d192f073acee7b6db.tar.gz forums-3b907d8642f3274fddc6563d192f073acee7b6db.tar.bz2 forums-3b907d8642f3274fddc6563d192f073acee7b6db.tar.xz forums-3b907d8642f3274fddc6563d192f073acee7b6db.zip | |
Minor changes
git-svn-id: file:///svn/phpbb/trunk@3874 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 2dcc2adecb..80a3d3fe34 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -69,11 +69,11 @@ function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $incl { case 'parents': $condition = 'f1.left_id BETWEEN f2.left_id AND f2.right_id'; - break; + break; case 'children': $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id'; - break; + break; default: $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id OR f1.left_id BETWEEN f2.left_id AND f2.right_id'; @@ -94,8 +94,11 @@ function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $incl { continue; } + $rows[] = $row; } + $db->sql_freeresult($result); + return $rows; } @@ -113,19 +116,20 @@ function generate_forum_nav(&$forum_data) { $template->assign_block_vars('navlinks', array( 'FORUM_NAME' => $parent_name, - 'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $parent_forum_id - )); + '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_data['forum_id'] - )); + 'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_data['forum_id']) + ); $template->assign_vars(array( 'FORUM_ID' => $forum_data['forum_id'], 'FORUM_NAME' => $forum_data['forum_name'], - 'FORUM_DESC' => $forum_data['forum_desc'] - )); + 'FORUM_DESC' => $forum_data['forum_desc']) + ); return; } |