diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-30 14:54:22 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-30 14:54:22 +0200 |
| commit | a6b07eef5aeb6eac5b4dbc1aae3a31087d12691b (patch) | |
| tree | a0bc4c9442cd16b21d7270c0aecc9caa0bcd73e9 /phpBB | |
| parent | 760957e7e7a2e089e537c9172248c86361078bff (diff) | |
| parent | 4746a60d221d2e32c98eff1f44d996bf7296e737 (diff) | |
| download | forums-a6b07eef5aeb6eac5b4dbc1aae3a31087d12691b.tar forums-a6b07eef5aeb6eac5b4dbc1aae3a31087d12691b.tar.gz forums-a6b07eef5aeb6eac5b4dbc1aae3a31087d12691b.tar.bz2 forums-a6b07eef5aeb6eac5b4dbc1aae3a31087d12691b.tar.xz forums-a6b07eef5aeb6eac5b4dbc1aae3a31087d12691b.zip | |
Merge branch 'ticket/nickvergessen/9094' into develop-olympus
* ticket/nickvergessen/9094:
[ticket/9094] Hide "Copy permissions" message, when permissions were copied.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 541a514bef..6261f866bb 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -190,12 +190,14 @@ class acp_forums $forum_perm_from = request_var('forum_perm_from', 0); $cache->destroy('sql', FORUMS_TABLE); + $copied_permissions = false; // 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(); + $copied_permissions = true; } /* 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')) @@ -211,13 +213,13 @@ class acp_forums $message = ($action == 'add') ? $user->lang['FORUM_CREATED'] : $user->lang['FORUM_UPDATED']; // Redirect to permissions - if ($auth->acl_get('a_fauth')) + 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' && !$forum_perm_from && $auth->acl_get('a_fauth')) + if ($action == 'add' && !$copied_permissions && $auth->acl_get('a_fauth')) { meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url)); } |