aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/report.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-07-22 00:51:03 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-07-22 00:51:03 +0200
commitfb5c8957ec4d5adff116dbee0bbdad7b3032b71c (patch)
tree877fa605bd39d456a6a011d9d11dfa87f7875aff /phpBB/report.php
parente60816eeb12e70be88467d708685ffa49f177691 (diff)
parent90e532430c94efa8bc5120bd81c9a5321c7deacb (diff)
downloadforums-fb5c8957ec4d5adff116dbee0bbdad7b3032b71c.tar
forums-fb5c8957ec4d5adff116dbee0bbdad7b3032b71c.tar.gz
forums-fb5c8957ec4d5adff116dbee0bbdad7b3032b71c.tar.bz2
forums-fb5c8957ec4d5adff116dbee0bbdad7b3032b71c.tar.xz
forums-fb5c8957ec4d5adff116dbee0bbdad7b3032b71c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [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 3f2e7a91ff..063e55e571 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -157,10 +157,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 *