From 56df3fd8cafde10b230c925c7eb455003ae76382 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Jul 2013 22:02:51 +0200
Subject: [PATCH 1/2] [ticket/11720] Do not call $captcha->validate if $captcha
 is not set

PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.

PHPBB3-11720
---
 phpBB/report.php | 9 ++++++---
 1 file 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 *

From 865bf0db3d5ca3f8bbadd009ce0a5e8324de49c1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Jul 2013 22:35:45 +0200
Subject: [PATCH 2/2] [ticket/11720] Add functional test for submitting report
 as user

The already existing functional tests were not ran as the filename was
missing the appended "_test".

PHPBB3-11720
---
 ...ptcha.php => report_post_captcha_test.php} | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
 rename tests/functional/{report_post_captcha.php => report_post_captcha_test.php} (89%)

diff --git a/tests/functional/report_post_captcha.php b/tests/functional/report_post_captcha_test.php
similarity index 89%
rename from tests/functional/report_post_captcha.php
rename to tests/functional/report_post_captcha_test.php
index af713775c5..8283465041 100644
--- a/tests/functional/report_post_captcha.php
+++ b/tests/functional/report_post_captcha_test.php
@@ -12,13 +12,6 @@
  */
 class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_case
 {
-	public function test_user_report_post()
-	{
-		$this->login();
-		$crawler = self::request('GET', 'report.php?f=2&p=1');
-		$this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
-	}
-
 	public function test_guest_report_post()
 	{
 		$crawler = self::request('GET', 'report.php?f=2&p=1');
@@ -31,6 +24,18 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca
 		$this->set_reporting_guest(-1);
 	}
 
+	public function test_user_report_post()
+	{
+		$this->login();
+		$crawler = self::request('GET', 'report.php?f=2&p=1');
+		$this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('POST_REPORTED_SUCCESS'), $crawler->text());
+	}
+
 	protected function set_reporting_guest($report_post_allowed)
 	{
 		$this->login();