diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
| commit | 73ac6b142375eaff4679a205a6bae537e4d019ac (patch) | |
| tree | 0257aa7d9985d75d5d1cd79d1bd87332e55f303c /phpBB/includes/acp/acp_forums.php | |
| parent | 3f3db8cdaa8a8066ee0f727fe44699a179aca04e (diff) | |
| download | forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.gz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.bz2 forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.xz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.zip | |
- some bugfixes
- set ip_check to A.B.C. by default
- display postings in other encodings by default and present link to force the encoding as usual.
git-svn-id: file:///svn/phpbb/trunk@6198 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index ee87f8f5c6..21f633f4f6 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -342,7 +342,20 @@ class acp_forums $forum_data = $row; } - $parents_list = make_forum_select($forum_data['parent_id'], $forum_id, false, false, false); + // Make sure there is no forum displayed for parents_list having the current forum id as a parent... + $sql = 'SELECT forum_id + FROM ' . FORUMS_TABLE . ' + WHERE parent_id = ' . $forum_id; + $result = $db->sql_query($sql); + + $exclude_forums = array($forum_id); + while ($row = $db->sql_fetchrow($result)) + { + $exclude_forums[] = $row['forum_id']; + } + $db->sql_freeresult($result); + + $parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, false, false, false); $forum_data['forum_password_confirm'] = $forum_data['forum_password']; } |