mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 17:45:18 +02:00
Code Issues Releases Wiki Activity

Disable copy forum permissions screen in forums creation/update workflow - also fixes Bug #52035

Browse Source 
We will revisit this one later

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10198 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-09-30 14:51:43 +00:00
parent d47c61bbb3
commit 80bc2d8dc9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/acp/acp_forums.php
View File

@ -193,18 +193,19 @@ class acp_forums
$cache->destroy('sql', FORUMS_TABLE); $cache->destroy('sql', FORUMS_TABLE);
// Copy permissions? // Copy permissions?
if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] && 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')))) ($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); copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false);
cache_moderators(); 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); $this->copy_permission_page($forum_data);
return; return;
} }
*/
$auth->acl_clear_prefetch(); $auth->acl_clear_prefetch();
$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
@ -1919,6 +1920,7 @@ class acp_forums
/** /**
* Display copy permission page * 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) function copy_permission_page($forum_data)
{ {