[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
This commit is contained in:
Josh Woody 2010-05-05 10:23:40 -05:00 committed by Nils Adermann
parent ed0a26ab16
commit e6b9178c44

View file

@ -407,7 +407,7 @@ class acp_forums
$exclude_forums[] = $row['forum_id']; $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']; $forum_data['forum_password_confirm'] = $forum_data['forum_password'];
} }
@ -416,7 +416,7 @@ class acp_forums
$this->page_title = 'CREATE_FORUM'; $this->page_title = 'CREATE_FORUM';
$forum_id = $this->parent_id; $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 // Fill forum data with default values
if (!$update) if (!$update)