diff options
| author | David King <imkingdavid@gmail.com> | 2013-08-31 13:37:11 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-08-31 13:37:11 -0700 |
| commit | af1eb7466f11cdb0f851acfcacd957267e20e3ce (patch) | |
| tree | 1c72f7436ffcaa0d355ee11a0375323dcf5731f6 /phpBB/report.php | |
| parent | 9485eea0987478da25327a06a4fd36943ca1c01c (diff) | |
| parent | 9d6370751f1b998e3da448e16c1446b33ddd17d0 (diff) | |
| download | forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.gz forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.bz2 forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.xz forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.zip | |
Merge branch 'develop' into ticket/11215
Diffstat (limited to 'phpBB/report.php')
| -rw-r--r-- | phpBB/report.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/phpBB/report.php b/phpBB/report.php index 3f2e7a91ff..5081f90ad1 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -139,15 +139,16 @@ else $reported_post_text = $report_data['message_text']; $reported_post_bitfield = $report_data['bbcode_bitfield']; - $reported_post_enable_bbcode = $report_data['reported_post_enable_bbcode']; - $reported_post_enable_smilies = $report_data['reported_post_enable_smilies']; - $reported_post_enable_magic_url = $report_data['reported_post_enable_magic_url']; + $reported_post_uid = $report_data['bbcode_uid']; + $reported_post_enable_bbcode = $report_data['enable_bbcode']; + $reported_post_enable_smilies = $report_data['enable_smilies']; + $reported_post_enable_magic_url = $report_data['enable_magic_url']; } if ($config['enable_post_confirm'] && !$user->data['is_registered']) { include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx); - $captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']); + $captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']); $captcha->init(CONFIRM_REPORT); } @@ -157,10 +158,13 @@ $s_hidden_fields = ''; // Submit report? if ($submit && $reason_id) { - $visual_confirmation_response = $captcha->validate(); - if ($visual_confirmation_response) + if (isset($captcha)) { - $error[] = $visual_confirmation_response; + $visual_confirmation_response = $captcha->validate(); + if ($visual_confirmation_response) + { + $error[] = $visual_confirmation_response; + } } $sql = 'SELECT * |