diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-03-01 14:01:57 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-03-01 14:07:32 +0000 |
| commit | c887eedaa5c9efeeec82cf29117325480905c9f3 (patch) | |
| tree | 7f859ac05ccb03acdd92fa27d25c0105f8624218 /phpBB/phpbb | |
| parent | d66a53a53127f9c50dd62c34bf08fdabacdea001 (diff) | |
| download | forums-c887eedaa5c9efeeec82cf29117325480905c9f3.tar forums-c887eedaa5c9efeeec82cf29117325480905c9f3.tar.gz forums-c887eedaa5c9efeeec82cf29117325480905c9f3.tar.bz2 forums-c887eedaa5c9efeeec82cf29117325480905c9f3.tar.xz forums-c887eedaa5c9efeeec82cf29117325480905c9f3.zip | |
[ticket/13661] Fixed the "FROM" in the built query.
I was doing it wrong by giving a string to the FROM clause in the built query.
PHPBB3-13661
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/log/log.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 1aa9e073f0..e2802ba3e1 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -523,7 +523,10 @@ class log implements \phpbb\log\log_interface $get_logs_sql_ary = array( 'SELECT' => 'l.*, u.username, u.username_clean, u.user_colour', - 'FROM' => $this->log_table . ' l, ' . USERS_TABLE . ' u', + 'FROM' => array( + $this->log_table => 'l', + USERS_TABLE => 'u', + ), 'WHERE' => 'l.user_id = u.user_id AND l.log_time >= ' . (int) $log_time . " $sql_keywords |