diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-03-01 18:35:11 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-03-01 18:41:20 +0000 |
| commit | d0a1650a04fc74fb81c0123505854a09352d49c1 (patch) | |
| tree | 9551e954126782e4ff404a8aa1e8ba7603d486f1 | |
| parent | c887eedaa5c9efeeec82cf29117325480905c9f3 (diff) | |
| download | forums-d0a1650a04fc74fb81c0123505854a09352d49c1.tar forums-d0a1650a04fc74fb81c0123505854a09352d49c1.tar.gz forums-d0a1650a04fc74fb81c0123505854a09352d49c1.tar.bz2 forums-d0a1650a04fc74fb81c0123505854a09352d49c1.tar.xz forums-d0a1650a04fc74fb81c0123505854a09352d49c1.zip | |
[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
| -rw-r--r-- | phpBB/phpbb/log/log.php | 6 |
1 files 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']; } |