aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_forums.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-03-22 22:54:24 +0100
committerIgor Wiedler <igor@wiedler.ch>2010-03-22 22:54:24 +0100
commita5057c9f2568d30b413d4b14140f6ecaac6315d5 (patch)
treecc814e87b4fc2b0295a3c277bdf133b2cf834674 /phpBB/includes/acp/acp_forums.php
parentae48c8ee9ecf7866e4fe1ca4d3390d69a1adc2b4 (diff)
parentb3ff3be0dc56fdf32a7ae34b271b9016efa99c3b (diff)
downloadforums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.gz
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.bz2
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.xz
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.zip
Merge branch 'develop-olympus' into git-tools
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
-rw-r--r--phpBB/includes/acp/acp_forums.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index bde59ec870..5a5adc57ae 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -407,7 +407,7 @@ class acp_forums
$exclude_forums[] = $row['forum_id'];
}
- $parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, false, false, false);
+ $parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, true, false, false);
$forum_data['forum_password_confirm'] = $forum_data['forum_password'];
}
@@ -416,7 +416,7 @@ class acp_forums
$this->page_title = 'CREATE_FORUM';
$forum_id = $this->parent_id;
- $parents_list = make_forum_select($this->parent_id, false, false, false, false);
+ $parents_list = make_forum_select($this->parent_id, false, true, false, false);
// Fill forum data with default values
if (!$update)