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

More r9896 cleanup.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9978 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-08-14 10:43:31 +00:00
parent 412bb22acb
commit 1683559e19
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,6 @@ class acp_forums
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'];
@ -722,14 +721,10 @@ class acp_forums
$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>'); $message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
} }
// redirect directly to permission settings screen if authed
if ($action == 'add' && !$forum_perm_from && $auth->acl_get('a_fauth'))
{
meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url));
}
trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id)); trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
} }
break;
} }
// Default management page // Default management page
@ -1920,6 +1915,9 @@ class acp_forums
adm_page_footer(); adm_page_footer();
} }
/**
* Display copy permission page
*/
function copy_permission_page($forum_data) function copy_permission_page($forum_data)
{ {
global $phpEx, $phpbb_admin_path, $template, $user; global $phpEx, $phpbb_admin_path, $template, $user;
@ -1927,11 +1925,8 @@ class acp_forums
$acl_url = '&amp;mode=setting_forum_local&amp;forum_id[]=' . $forum_data['forum_id']; $acl_url = '&amp;mode=setting_forum_local&amp;forum_id[]=' . $forum_data['forum_id'];
$action = append_sid($this->u_action . "&amp;parent_id={$this->parent_id}&amp;f={$forum_data['forum_id']}&amp;action=copy_perm"); $action = append_sid($this->u_action . "&amp;parent_id={$this->parent_id}&amp;f={$forum_data['forum_id']}&amp;action=copy_perm");
$l_acl = sprintf($user->lang['COPY_TO_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>'); $l_acl = sprintf($user->lang['COPY_TO_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
$this->tpl_name = 'acp_forums_copy_perm'; $this->tpl_name = 'acp_forums_copy_perm';
$template->assign_vars(array( $template->assign_vars(array(