diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-03-15 22:48:53 -0500 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-03-17 10:04:07 -0500 |
| commit | 144effd74cf52a71a62e127276d78f56eab41835 (patch) | |
| tree | ed27cdf87466de2c06e1cbec2f79e7dfa162b4e5 | |
| parent | be78817d27d12bea25f445e04c143def8135831a (diff) | |
| download | forums-144effd74cf52a71a62e127276d78f56eab41835.tar forums-144effd74cf52a71a62e127276d78f56eab41835.tar.gz forums-144effd74cf52a71a62e127276d78f56eab41835.tar.bz2 forums-144effd74cf52a71a62e127276d78f56eab41835.tar.xz forums-144effd74cf52a71a62e127276d78f56eab41835.zip | |
Allow setting parent forums regardless of permission settings. (Bug #58415)
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 53863da302..560e1e9013 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -98,6 +98,7 @@ <li>[Fix] Allow redirect() function to redirect across directories. (Bug #56965)</li> <li>[Fix] Add terminating semicolons to JavaScript code. (Bug #58085 - Patch by nn-)</li> <li>[Fix] Minor language fixes. (Bug #54855)</li> + <li>[Fix] Allow setting parent forums regardless of permission settings. (Bug #57415)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> </ul> 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) |