diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:21:47 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:21:47 +0200 |
| commit | f0afccb173fb728b6c70a8bd86c4d8869043581a (patch) | |
| tree | a6621ca13c644cacb8e36d449f338ecdcf78756c /phpBB/includes/acp | |
| parent | 4db585a4cb2e5359074a82ef088574609155294b (diff) | |
| parent | b94464d06382a4b379d9dcd52f1bee757a4a0500 (diff) | |
| download | forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar.gz forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar.bz2 forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar.xz forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.zip | |
Merge branch 'prep-release-3.2.8' into 3.2.x
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 1f7374a07f..56079061ce 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -33,7 +33,6 @@ class acp_bbcodes // Set up general vars $action = $request->variable('action', ''); $bbcode_id = $request->variable('bbcode', 0); - $submit = $request->is_set_post('submit'); $this->tpl_name = 'acp_bbcodes'; $this->page_title = 'ACP_BBCODES'; @@ -41,11 +40,6 @@ class acp_bbcodes add_form_key($form_key); - if ($submit && !check_form_key($form_key)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - // Set up mode-specific vars switch ($action) { @@ -179,6 +173,12 @@ class acp_bbcodes extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create', compact($vars))); $warn_text = preg_match('%<[^>]*\{text[\d]*\}[^>]*>%i', $bbcode_tpl); + + if (!$warn_text && !check_form_key($form_key)) + { + trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); + } + if (!$warn_text || confirm_box(true)) { $data = $this->build_regexp($bbcode_match, $bbcode_tpl); diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index 3eee4f7922..c5f7789de8 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -537,6 +537,7 @@ class acp_prune AND ug.user_id <> ' . ANONYMOUS . ' AND u.user_type <> ' . USER_FOUNDER . ' AND ug.user_pending = 0 + AND ug.group_leader = 0 AND u.user_id = ug.user_id ' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : ''); $result = $db->sql_query($sql); |