[Phpbb-checkins] r10198 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Wed Sep 30 15:51:43 2009
New Revision: 10198

Log:
Disable copy forum permissions screen in forums creation/update workflow - also fixes Bug #52035
We will revisit this one later

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Wed Sep 30 15:51:43 2009
***************
*** 193,210 ****
  						$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'))))
  						{
  							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'))
  						{
  							$this->copy_permission_page($forum_data);
  							return;
  						}
! 
  						$auth->acl_clear_prefetch();
  
  						$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
--- 193,211 ----
  						$cache->destroy('sql', FORUMS_TABLE);
  
  						// Copy permissions?
! 						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();
  						}
! /* 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,1924 ****
--- 1920,1926 ----
  
  	/**
  	* 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)
  	{