diff options
author | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:17:46 +0100 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:17:46 +0100 |
commit | 5a8359b90e8510e4d2e0833728088d0be0ce227c (patch) | |
tree | bdc67c1bdca75ac12c0a0c3f9cb966da2d3615b5 /phpBB/includes/db | |
parent | 03918f7fd2fd790d5ebd4330f9f913bfcc206f91 (diff) | |
parent | cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8 (diff) | |
download | forums-5a8359b90e8510e4d2e0833728088d0be0ce227c.tar forums-5a8359b90e8510e4d2e0833728088d0be0ce227c.tar.gz forums-5a8359b90e8510e4d2e0833728088d0be0ce227c.tar.bz2 forums-5a8359b90e8510e4d2e0833728088d0be0ce227c.tar.xz forums-5a8359b90e8510e4d2e0833728088d0be0ce227c.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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/db')
-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 a61dc5f58a..4f33a22a09 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -631,7 +631,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'])) { |