diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-31 13:34:04 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-31 13:34:04 +0200 |
| commit | 9c497a7b462a24b980912af669a44bfb82f5bdc2 (patch) | |
| tree | e3f6d75521b07196c22df2af05719b352d6ddd02 | |
| parent | 36071ded9d37f38d446d17013b90dff9da94245b (diff) | |
| download | forums-9c497a7b462a24b980912af669a44bfb82f5bdc2.tar forums-9c497a7b462a24b980912af669a44bfb82f5bdc2.tar.gz forums-9c497a7b462a24b980912af669a44bfb82f5bdc2.tar.bz2 forums-9c497a7b462a24b980912af669a44bfb82f5bdc2.tar.xz forums-9c497a7b462a24b980912af669a44bfb82f5bdc2.zip | |
[ticket/12639] Add a test case with an empty keywords list
PHPBB3-12639
| -rw-r--r-- | phpBB/phpbb/log/log.php | 2 | ||||
| -rw-r--r-- | tests/log/delete_test.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 6217a7fe46..0dce9306df 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -395,7 +395,7 @@ class log implements \phpbb\log\log_interface { if ($field == 'keywords') { - $sql_where .= $this->generate_sql_keyword($field_value, '', ''); + $sql_where .= $this->generate_sql_keyword($field_value, '', ' AND'); } else { diff --git a/tests/log/delete_test.php b/tests/log/delete_test.php index f10e3e582b..14895de059 100644 --- a/tests/log/delete_test.php +++ b/tests/log/delete_test.php @@ -56,5 +56,10 @@ class phpbb_log_delete_test extends phpbb_database_test_case $this->assertCount(3, $log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC')); $log->delete('critical', array('user_id' => array('>', 1))); $this->assertCount(1, $log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC')); + + // Delete with an empty keyword list + $this->assertCount(1, $log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC')); + $log->delete('critical', array('keywords' => '')); + $this->assertEmpty($log->get_logs('critical', false, 0, 0, 0, 0, 0, 0, 'l.log_time DESC')); } } |