diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-05-05 10:23:40 -0500 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 18:20:54 +0200 |
| commit | e6b9178c4439f14b085470f7f16c1fee67262296 (patch) | |
| tree | fc1747c37db4297d0fa7849c4b49480b05734ca4 | |
| parent | ed0a26ab16282c3e053df46fa3a33185654642b4 (diff) | |
| download | forums-e6b9178c4439f14b085470f7f16c1fee67262296.tar forums-e6b9178c4439f14b085470f7f16c1fee67262296.tar.gz forums-e6b9178c4439f14b085470f7f16c1fee67262296.tar.bz2 forums-e6b9178c4439f14b085470f7f16c1fee67262296.tar.xz forums-e6b9178c4439f14b085470f7f16c1fee67262296.zip | |
[ticket/9510] Unable to copy permissions from and to forums you cannot see
This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed.
PHPBB3-9510
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 54bf905374..7b7671573e 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, true, false, false); + $parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, false, 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, true, false, false); + $parents_list = make_forum_select($this->parent_id, false, false, false, false); // Fill forum data with default values if (!$update) |