2 files changed, 18 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index 2945e1ec8a..92dcdb5499 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -115,7 +115,7 @@ class mcp_logs
 				if ($deletemark && sizeof($marked))
 				{
 					$conditions = array(
-						'forum_id'	=> $forum_list,
+						'forum_id'	=> array('IN' => $forum_list),
 						'log_id'	=> array('IN' => $marked),
 					);
 
@@ -126,7 +126,7 @@ class mcp_logs
 					$keywords = utf8_normalize_nfc(request_var('keywords', '', true));
 
 					$conditions = array(
-						'forum_id'	=> $forum_list,
+						'forum_id'	=> array('IN' => $forum_list),
 						'keywords'	=> $keywords,
 					);
 
diff --git a/tests/functional/mcp_test.php b/tests/functional/mcp_test.php
index 31d835f4fa..40615d66a5 100644
--- a/tests/functional/mcp_test.php
+++ b/tests/functional/mcp_test.php
@@ -64,4 +64,20 @@ class phpbb_functional_mcp_test extends phpbb_functional_test_case
 		$crawler = self::submit($form);
 		$this->assertContains($this->lang('POSTS_MERGED_SUCCESS'), $crawler->text());
 	}
+
+	public function test_delete_logs()
+	{
+		$this->login();
+		$crawler = self::request('GET', "mcp.php?i=mcp_logs&mode=front&sid={$this->sid}");
+		$this->assertGreaterThanOrEqual(1, $crawler->filter('input[type=checkbox]')->count());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton($this->lang('DELETE_ALL'))->form();
+		$crawler = self::submit($form);
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+
+		$this->assertCount(0, $crawler->filter('input[type=checkbox]'));
+	}
 }