diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-30 14:51:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-30 14:51:43 +0000 |
| commit | 80bc2d8dc911d3d53d3d1d394064513f2aa3e5bd (patch) | |
| tree | 428f03e2533f432407b6ad7800e829c9d6fa7610 /phpBB/includes | |
| parent | d47c61bbb3f955cef0b257cc3eeed43ef909bc51 (diff) | |
| download | forums-80bc2d8dc911d3d53d3d1d394064513f2aa3e5bd.tar forums-80bc2d8dc911d3d53d3d1d394064513f2aa3e5bd.tar.gz forums-80bc2d8dc911d3d53d3d1d394064513f2aa3e5bd.tar.bz2 forums-80bc2d8dc911d3d53d3d1d394064513f2aa3e5bd.tar.xz forums-80bc2d8dc911d3d53d3d1d394064513f2aa3e5bd.zip | |
Disable copy forum permissions screen in forums creation/update workflow - also fixes Bug #52035
We will revisit this one later
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10198 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 62ccbdb68e..2ff597ee98 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -193,18 +193,19 @@ class acp_forums $cache->destroy('sql', FORUMS_TABLE); // Copy permissions? - if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] && - (($action != 'edit') || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')))) + if ($forum_perm_from && $forum_perm_from != $forum_data['forum_id'] && + ($action != 'edit' || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')))) { copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false); cache_moderators(); } - else if (($action != 'edit') && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')) +/* Commented out because of questionable UI workflow - re-visit for 3.0.7 + else if (!$this->parent_id && $action != 'edit' && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')) { $this->copy_permission_page($forum_data); return; } - +*/ $auth->acl_clear_prefetch(); $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; @@ -1919,6 +1920,7 @@ class acp_forums /** * Display copy permission page + * Not used at the moment - we will have a look at it for 3.0.7 */ function copy_permission_page($forum_data) { |