diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 11:53:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 11:53:38 +0200 |
| commit | 248b11c4db632171ff8035ae4f1842e59815fca8 (patch) | |
| tree | eb1edd607f4ee095de0748a91cb5bf05b6e96ac2 | |
| parent | b2a883d504d9ece8525fcc1a4aa8e44a000db6ca (diff) | |
| parent | 8de8cbab5e8c0beb4ee621a8527fd989e608e497 (diff) | |
| download | forums-248b11c4db632171ff8035ae4f1842e59815fca8.tar forums-248b11c4db632171ff8035ae4f1842e59815fca8.tar.gz forums-248b11c4db632171ff8035ae4f1842e59815fca8.tar.bz2 forums-248b11c4db632171ff8035ae4f1842e59815fca8.tar.xz forums-248b11c4db632171ff8035ae4f1842e59815fca8.zip | |
Merge pull request #2701 from Nicofuma/ticket/12818
[ticket/12818] Deleting a log entry in MCP produces a General error
* Nicofuma/ticket/12818:
[ticket/12818] Use assertGreaterThanOrEqual in the tests
[ticket/12818] Don't use the id for i=
[ticket/12818] Add tests
[ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
| -rw-r--r-- | phpBB/includes/mcp/mcp_logs.php | 4 | ||||
| -rw-r--r-- | tests/functional/mcp_test.php | 16 |
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]')); + } } |