aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-07 21:19:17 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-07 21:19:17 +0100
commit8dbda26623ba86c5de9cc45303dbfd0c8170bb97 (patch)
tree74e79c363535e064b03bb629bd0a12602c1c0257 /phpBB/posting.php
parent5d6f8c8bd91eaed92631bbedd989e37e7ebc1c31 (diff)
parent04204c7ec6ecb2572cb41727140ae7c7644a4c63 (diff)
downloadforums-8dbda26623ba86c5de9cc45303dbfd0c8170bb97.tar
forums-8dbda26623ba86c5de9cc45303dbfd0c8170bb97.tar.gz
forums-8dbda26623ba86c5de9cc45303dbfd0c8170bb97.tar.bz2
forums-8dbda26623ba86c5de9cc45303dbfd0c8170bb97.tar.xz
forums-8dbda26623ba86c5de9cc45303dbfd0c8170bb97.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r--phpBB/posting.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index da70e64877..c5d0693f35 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -256,12 +256,6 @@ if ($mode == 'popup')
$user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
-if ($config['enable_post_confirm'] && !$user->data['is_registered'])
-{
- $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
- $captcha->init(CONFIRM_POST);
-}
-
// Use post_row values in favor of submitted ones...
$forum_id = (!empty($post_data['forum_id'])) ? (int) $post_data['forum_id'] : (int) $forum_id;
$topic_id = (!empty($post_data['topic_id'])) ? (int) $post_data['topic_id'] : (int) $topic_id;
@@ -427,6 +421,12 @@ if (!$is_authed || !empty($error))
login_box('', $message);
}
+if ($config['enable_post_confirm'] && !$user->data['is_registered'])
+{
+ $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
+ $captcha->init(CONFIRM_POST);
+}
+
// Is the user able to post within this forum?
if ($post_data['forum_type'] != FORUM_POST && in_array($mode, array('post', 'bump', 'quote', 'reply')))
{