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] Handle $conditions['keywords'] outside of the loop

Browse source 
PHPBB3-12639
This commit is contained in:
Tristan Darricau 2014-06-02 23:35:35 +02:00
parent 3e31764007
commit f980fed5d2
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,13 +391,15 @@ class log implements \phpbb\log\log_interface
} }
$sql_where = 'WHERE log_type = ' . $log_type; $sql_where = 'WHERE log_type = ' . $log_type;
foreach ($conditions as $field => $field_value)
if (isset($conditions['keywords']))
{ {
if ($field == 'keywords') $sql_where .= $this->generate_sql_keyword($conditions['keywords'], '', ' AND');
{
$sql_where .= $this->generate_sql_keyword($field_value, '', ' AND'); unset($conditions['keywords']);
} }
else
foreach ($conditions as $field => $field_value)
{ {
$sql_where .= ' AND '; $sql_where .= ' AND ';
@ -414,7 +416,6 @@ class log implements \phpbb\log\log_interface
$sql_where .= $field . ' = ' . $field_value; $sql_where .= $field . ' = ' . $field_value;
} }
} }
}
$sql = 'DELETE FROM ' . LOG_TABLE . " $sql = 'DELETE FROM ' . LOG_TABLE . "
$sql_where"; $sql_where";