diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-01-17 17:57:06 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-01-17 17:57:06 -0800 |
| commit | 574eb2c199489eee4d21e0af0dd51dcb842bcc77 (patch) | |
| tree | 15202c2de02d67f5de0f1e673a58fe3b70ec065b | |
| parent | 6c8f217832d1a431a3c382d7de3ccad840d65d7a (diff) | |
| parent | 83ec308eff0554037fdf1f215e9e9ad444bc30a9 (diff) | |
| download | forums-574eb2c199489eee4d21e0af0dd51dcb842bcc77.tar forums-574eb2c199489eee4d21e0af0dd51dcb842bcc77.tar.gz forums-574eb2c199489eee4d21e0af0dd51dcb842bcc77.tar.bz2 forums-574eb2c199489eee4d21e0af0dd51dcb842bcc77.tar.xz forums-574eb2c199489eee4d21e0af0dd51dcb842bcc77.zip | |
Merge pull request #1947 from bantu/ticket/12107
[ticket/12107] Use log table property instead of log table constant.
| -rw-r--r-- | phpBB/phpbb/log/log.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index a6ee06ebf2..62edc6a77f 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -424,7 +424,7 @@ class log implements \phpbb\log\log_interface if ($count_logs) { $sql = 'SELECT COUNT(l.log_id) AS total_entries - FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . ' u + FROM ' . $this->log_table . ' l, ' . USERS_TABLE . ' u WHERE l.log_type = ' . (int) $log_type . ' AND l.user_id = u.user_id AND l.log_time >= ' . (int) $log_time . " @@ -449,7 +449,7 @@ class log implements \phpbb\log\log_interface } $sql = 'SELECT l.*, u.username, u.username_clean, u.user_colour - FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . ' u + FROM ' . $this->log_table . ' l, ' . USERS_TABLE . ' u WHERE l.log_type = ' . (int) $log_type . ' AND u.user_id = l.user_id ' . (($log_time) ? 'AND l.log_time >= ' . (int) $log_time : '') . " |