makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bug/jellydoughnut/58415' into develop-olympus

Browse source 
* bug/jellydoughnut/58415:
  Allow setting parent forums regardless of permission settings. (Bug #58415)

Conflicts:
	phpBB/docs/CHANGELOG.html
This commit is contained in:
Nils Adermann 2010-03-17 18:05:17 +01:00
commit 10f81ee79f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -103,6 +103,7 @@
<li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li>
<li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</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] 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> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li>
</ul> </ul>

4
phpBB/includes/acp/acp_forums.php
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, 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']; $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, false, false, false); $parents_list = make_forum_select($this->parent_id, false, true, false, false);
// Fill forum data with default values // Fill forum data with default values
if (!$update) if (!$update)