makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12639] Add a test case with an empty keywords list

Browse source 
PHPBB3-12639
This commit is contained in:
Tristan Darricau 2014-05-31 13:34:04 +02:00
parent 36071ded9d
commit 9c497a7b46
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/log/log.php
View file

@ -395,7 +395,7 @@ class log implements \phpbb\log\log_interface
{ {
if ($field == 'keywords') if ($field == 'keywords')
{ {
$sql_where .= $this->generate_sql_keyword($field_value, '', ''); $sql_where .= $this->generate_sql_keyword($field_value, '', ' AND');
} }
else else
{ {

5
tests/log/delete_test.php
View file

@ -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')); $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))); $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')); $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'));
} }
} }