4 files changed, 23 insertions, 12 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 6f21dfa6ac..efb0639f1b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -127,8 +127,10 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) {
  * The removes the parent row of the link or form that triggered the callback,
  * and is good for stuff like the removal of forums.
  */
-phpbb.addAjaxCallback('row_delete', function() {
-	$(this).parents('tr').remove();
+phpbb.addAjaxCallback('row_delete', function(res) {
+	if (res.SUCCESS !== false) {
+		$(this).parents('tr').remove();
+	}
 });
 
 
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index a1e681b29c..7a1d30196d 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -379,6 +379,7 @@ class acp_modules
 				$json_response->send(array(
 					'MESSAGE_TITLE'	=> $user->lang('ERROR'),
 					'MESSAGE_TEXT'	=> implode('<br />', $errors),
+					'SUCCESS'	=> false,
 				));
 			}
 
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 *
diff --git a/tests/functional/report_post_captcha.php b/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();