diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:17:20 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:17:20 +0100 |
| commit | cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8 (patch) | |
| tree | 0fa17c6ab983b7178aac3c9ae715bfd79ac4116f /phpBB/includes | |
| parent | 93c4cdd1dee4a408ef071b6ba67cbd2817f40c83 (diff) | |
| parent | 3d893c8222646e95aeae0301d954cfe62aa8486a (diff) | |
| download | forums-cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8.tar forums-cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8.tar.gz forums-cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8.tar.bz2 forums-cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8.tar.xz forums-cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop-olympus
* github-nickvergessen/ticket/10296:
[ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
[ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 9b45c085a2..b4c1a72e1c 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -609,7 +609,7 @@ class dbal } } - $sql .= $this->_sql_custom_build('FROM', implode(', ', $table_array)); + $sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array)); if (!empty($array['LEFT_JOIN'])) { |