From d0a1650a04fc74fb81c0123505854a09352d49c1 Mon Sep 17 00:00:00 2001 From: brunoais Date: Sun, 1 Mar 2015 18:35:11 +0000 Subject: [PATCH] [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 --- phpBB/phpbb/log/log.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index e2802ba3e1..735d595bb5 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -527,8 +527,8 @@ class log implements \phpbb\log\log_interface $this->log_table => 'l', USERS_TABLE => 'u', ), - 'WHERE' => 'l.user_id = u.user_id - AND l.log_time >= ' . (int) $log_time . " + 'WHERE' => 'l.log_type = ' . (int) $log_type . " + AND l.user_id = u.user_id $sql_keywords $sql_additional", @@ -536,7 +536,7 @@ class log implements \phpbb\log\log_interface ); 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']; }