makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58: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

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

@ -391,28 +391,29 @@ class log implements \phpbb\log\log_interface
} }
$sql_where = 'WHERE log_type = ' . $log_type; $sql_where = 'WHERE log_type = ' . $log_type;
if (isset($conditions['keywords']))
{
$sql_where .= $this->generate_sql_keyword($conditions['keywords'], '', ' AND');
unset($conditions['keywords']);
}
foreach ($conditions as $field => $field_value) foreach ($conditions as $field => $field_value)
{ {
if ($field == 'keywords') $sql_where .= ' AND ';
if (is_array($field_value) && sizeof($field_value) == 2 && !is_array($field_value[1]))
{ {
$sql_where .= $this->generate_sql_keyword($field_value, '', ' AND'); $sql_where .= $field . ' ' . $field_value[0] . ' ' . $field_value[1];
}
else if (is_array($field_value) && isset($field_value['IN']) && is_array($field_value['IN']))
{
$sql_where .= $this->db->sql_in_set($field, $field_value['IN']);
} }
else else
{ {
$sql_where .= ' AND '; $sql_where .= $field . ' = ' . $field_value;
if (is_array($field_value) && sizeof($field_value) == 2 && !is_array($field_value[1]))
{
$sql_where .= $field . ' ' . $field_value[0] . ' ' . $field_value[1];
}
else if (is_array($field_value) && isset($field_value['IN']) && is_array($field_value['IN']))
{
$sql_where .= $this->db->sql_in_set($field, $field_value['IN']);
}
else
{
$sql_where .= $field . ' = ' . $field_value;
}
} }
} }