From c887eedaa5c9efeeec82cf29117325480905c9f3 Mon Sep 17 00:00:00 2001
From: brunoais <brunoaiss@gmail.com>
Date: Sun, 1 Mar 2015 14:01:57 +0000
Subject: [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
---
 phpBB/phpbb/log/log.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb')

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
-- 
cgit v1.2.1