diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-21 11:39:09 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-21 11:39:09 +0000 |
| commit | f1ba99ec0da4b49269e63e90f758eecb37a1ea3d (patch) | |
| tree | b4a2e33ddcf00b7714a0942e9e81b96731f261af /phpBB | |
| parent | 358fba6b2fa9795e0d03e5b7ffb3edd3dfe309e4 (diff) | |
| download | forums-f1ba99ec0da4b49269e63e90f758eecb37a1ea3d.tar forums-f1ba99ec0da4b49269e63e90f758eecb37a1ea3d.tar.gz forums-f1ba99ec0da4b49269e63e90f758eecb37a1ea3d.tar.bz2 forums-f1ba99ec0da4b49269e63e90f758eecb37a1ea3d.tar.xz forums-f1ba99ec0da4b49269e63e90f758eecb37a1ea3d.zip | |
#13663
git-svn-id: file:///svn/phpbb/trunk@7915 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6a8e27f6dd..4450be81d6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -264,6 +264,8 @@ p a { <li>[Feature] Ability to disable birthdays completely with new board features setting</li> <li>[Fix] Fix disallowed username check (Bug #13511)</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> diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 96f7a15255..66a9d7ff75 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -163,7 +163,7 @@ class acp_forums $forum_perm_from = request_var('forum_perm_from', 0); // 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 ($action == 'edit') @@ -638,7 +638,7 @@ class acp_forums 'S_STATUS_OPTIONS' => $statuslist, 'S_PARENT_OPTIONS' => $parents_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_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, |