diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-11-13 16:09:12 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-11-13 16:09:12 +0100 |
| commit | ac8db51c47eed82761699be9bd2a4394c39d6b6c (patch) | |
| tree | 4a52dba7e059c53705c76820b43df33f11d0a8da /phpBB/includes/acp | |
| parent | 8f381fc8aeeaf534d85b1bb53ec6b76648f6567f (diff) | |
| parent | 00f792f16f6f8c9a826c5a44e539fb3aeb80c340 (diff) | |
| download | forums-ac8db51c47eed82761699be9bd2a4394c39d6b6c.tar forums-ac8db51c47eed82761699be9bd2a4394c39d6b6c.tar.gz forums-ac8db51c47eed82761699be9bd2a4394c39d6b6c.tar.bz2 forums-ac8db51c47eed82761699be9bd2a4394c39d6b6c.tar.xz forums-ac8db51c47eed82761699be9bd2a4394c39d6b6c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10190] Do not show hint about permissions when editing forum settings.
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 854f262a0b..7fe8915ad1 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -212,15 +212,11 @@ class acp_forums $message = ($action == 'add') ? $user->lang['FORUM_CREATED'] : $user->lang['FORUM_UPDATED']; - // Redirect to permissions - if ($auth->acl_get('a_fauth') && !$copied_permissions) - { - $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' && !$copied_permissions && $auth->acl_get('a_fauth')) { + $message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>'); + meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url)); } |