From 3b907d8642f3274fddc6563d192f073acee7b6db Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Thu, 17 Apr 2003 17:47:41 +0000
Subject: [PATCH] Minor changes

git-svn-id: file:///svn/phpbb/trunk@3874 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php       | 20 ++++++++++++--------
 phpBB/includes/functions_admin.php |  2 +-
 2 files changed, 13 insertions(+), 9 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 . '&amp;f=' . $parent_forum_id
-		));
+			'U_VIEW_FORUM'	=>	'viewforum.' . $phpEx . $SID . '&amp;f=' . $parent_forum_id)
+		);
 	}
+
 	$template->assign_block_vars('navlinks', array(
 		'FORUM_NAME'	=>	$forum_data['forum_name'],
-		'U_VIEW_FORUM'	=>	'viewforum.' . $phpEx . $SID . '&amp;f=' . $forum_data['forum_id']
-	));
+		'U_VIEW_FORUM'	=>	'viewforum.' . $phpEx . $SID . '&amp;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;
 }
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 9a3b6dd82a..747627b1cf 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -50,7 +50,7 @@ function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl =
 
 		$right = $row['right_id'];
 
-		$selected = (is_array($select_id)) ? ((in_array($row['forum_id'], $select_id)) ? ' selected="selected"' : '') : (($row['forum_id'] == $select_id || $select_id === 0) ? ' selected="selected"' : '');
+		$selected = (is_array($select_id)) ? ((in_array($row['forum_id'], $select_id)) ? ' selected="selected"' : '') : (($row['forum_id'] == $select_id) ? ' selected="selected"' : '');
 
 		if ($row['left_id'] > $cat_right)
 		{