aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/report.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-07-22 00:50:49 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-07-22 00:50:49 +0200
commit90e532430c94efa8bc5120bd81c9a5321c7deacb (patch)
tree4e076dc4a32a76bbb76b98a3e36dfe03ec6f6543 /phpBB/report.php
parent8d8a0602d6670764ccd01b2082b9d085f773f8e0 (diff)
parent148df3607b230dfd77aa426657ce27b6d24e396b (diff)
downloadforums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar.gz
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar.bz2
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.tar.xz
forums-90e532430c94efa8bc5120bd81c9a5321c7deacb.zip
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
Diffstat (limited to 'phpBB/report.php')
-rw-r--r--phpBB/report.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/report.php b/phpBB/report.php
index c92ecdfdcc..c909b4fcf3 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -146,10 +146,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 *