[ticket/13661] bugfix: The conditional is the log_time, not log_type

I mistakenly made the log_type the conditional instead of log_time.
Thankfully, the automated tests helped finding this mistake.

PHPBB3-13661
This commit is contained in:
brunoais 2015-03-01 18:35:11 +00:00
parent c887eedaa5
commit d0a1650a04

View file

@ -527,8 +527,8 @@ class log implements \phpbb\log\log_interface
$this->log_table => 'l', $this->log_table => 'l',
USERS_TABLE => 'u', USERS_TABLE => 'u',
), ),
'WHERE' => 'l.user_id = u.user_id 'WHERE' => 'l.log_type = ' . (int) $log_type . "
AND l.log_time >= ' . (int) $log_time . " AND l.user_id = u.user_id
$sql_keywords $sql_keywords
$sql_additional", $sql_additional",
@ -536,7 +536,7 @@ class log implements \phpbb\log\log_interface
); );
if($log_type){ if($log_type){
$get_logs_sql_ary['WHERE'] = 'l.log_type = ' . (int) $log_type . ' $get_logs_sql_ary['WHERE'] = 'l.log_time >= ' . (int) $log_time . '
AND ' . $get_logs_sql_ary['WHERE']; AND ' . $get_logs_sql_ary['WHERE'];
} }