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

#13663

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7915 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-07-21 11:39:09 +00:00
parent 358fba6b2f
commit f1ba99ec0d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View file

@ -264,6 +264,8 @@ p a {
<li>[Feature] Ability to disable birthdays completely with new board features setting</li> <li>[Feature] Ability to disable birthdays completely with new board features setting</li>
<li>[Fix] Fix disallowed username check (Bug #13511)</li> <li>[Fix] Fix disallowed username check (Bug #13511)</li>
<li>[Fix] Allow for unicode usernames to be pruned (Bug #13643)</li> <li>[Fix] Allow for unicode usernames to be pruned (Bug #13643)</li>
<li>[Fix] Do not copy forum permissions from self(Bug #13663)</li>
</ul> </ul>

4
phpBB/includes/acp/acp_forums.php
View file

@ -163,7 +163,7 @@ class acp_forums
$forum_perm_from = request_var('forum_perm_from', 0); $forum_perm_from = request_var('forum_perm_from', 0);
// Copy permissions? // Copy permissions?
if ($forum_perm_from) if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from == $forum_data['forum_id'])
{ {
// if we edit a forum delete current permissions first // if we edit a forum delete current permissions first
if ($action == 'edit') if ($action == 'edit')
@ -638,7 +638,7 @@ class acp_forums
'S_STATUS_OPTIONS' => $statuslist, 'S_STATUS_OPTIONS' => $statuslist,
'S_PARENT_OPTIONS' => $parents_list, 'S_PARENT_OPTIONS' => $parents_list,
'S_STYLES_OPTIONS' => $styles_list, 'S_STYLES_OPTIONS' => $styles_list,
'S_FORUM_OPTIONS' => make_forum_select(($action == 'add') ? $forum_data['parent_id'] : false, false, false, false, false), 'S_FORUM_OPTIONS' => make_forum_select(($action == 'add') ? $forum_data['parent_id'] : false, ($action == 'edit') ? $forum_data['forum_id'] : false, false, false, false),
'S_SHOW_DISPLAY_ON_INDEX' => $s_show_display_on_index, 'S_SHOW_DISPLAY_ON_INDEX' => $s_show_display_on_index,
'S_FORUM_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false, 'S_FORUM_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false,
'S_FORUM_ORIG_POST' => (isset($old_forum_type) && $old_forum_type == FORUM_POST) ? true : false, 'S_FORUM_ORIG_POST' => (isset($old_forum_type) && $old_forum_type == FORUM_POST) ? true : false,