diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-17 18:05:17 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-17 18:05:17 +0100 |
| commit | 10f81ee79fe20baae7eb0dcced0d7a48110c3f8b (patch) | |
| tree | e46d53f88e71ea03a7eae954d25ac0c7b26ba57d /phpBB | |
| parent | 60bd1edcb5e5992e6e693d0f68db47e678f7d54a (diff) | |
| parent | 144effd74cf52a71a62e127276d78f56eab41835 (diff) | |
| download | forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.gz forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.bz2 forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.xz forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.zip | |
Merge branch 'bug/jellydoughnut/58415' into develop-olympus
* bug/jellydoughnut/58415:
Allow setting parent forums regardless of permission settings. (Bug #58415)
Conflicts:
phpBB/docs/CHANGELOG.html
Diffstat (limited to 'phpBB')
| -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 7b8d8f63f2..e5dcd82806 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -103,6 +103,7 @@ <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li> <li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</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) |