diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-11-13 16:08:19 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-11-13 16:08:19 +0100 |
| commit | 00f792f16f6f8c9a826c5a44e539fb3aeb80c340 (patch) | |
| tree | eab6d5d53e6f3db720cde884ced5d171ba7c94d9 /phpBB/includes/acp | |
| parent | 4c765bb20653272db49d98a311ae9eea6c480265 (diff) | |
| parent | fa23def7742b66b25a8c71e68d334f999624a84d (diff) | |
| download | forums-00f792f16f6f8c9a826c5a44e539fb3aeb80c340.tar forums-00f792f16f6f8c9a826c5a44e539fb3aeb80c340.tar.gz forums-00f792f16f6f8c9a826c5a44e539fb3aeb80c340.tar.bz2 forums-00f792f16f6f8c9a826c5a44e539fb3aeb80c340.tar.xz forums-00f792f16f6f8c9a826c5a44e539fb3aeb80c340.zip | |
Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympus
* bantu/ticket/10190:
[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 27bec3f1ea..50e12a0f15 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)); } |