diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-02-25 07:55:24 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-03-16 11:14:25 +0000 |
| commit | 46de94690453e0bd6dfc589682b7c4ede34f1d59 (patch) | |
| tree | fee98f42985a0f18d3e1cc8beed02416cfcba5ad /phpBB/phpbb/db/driver | |
| parent | b54adaaabed7546254ff8317763214cce3a40237 (diff) | |
| download | forums-46de94690453e0bd6dfc589682b7c4ede34f1d59.tar forums-46de94690453e0bd6dfc589682b7c4ede34f1d59.tar.gz forums-46de94690453e0bd6dfc589682b7c4ede34f1d59.tar.bz2 forums-46de94690453e0bd6dfc589682b7c4ede34f1d59.tar.xz forums-46de94690453e0bd6dfc589682b7c4ede34f1d59.zip | |
[feature/sql-bool-builder] Added code to use this feature for the WHERE clause
PHPBB3-13652
Diffstat (limited to 'phpBB/phpbb/db/driver')
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index cdff6bf9de..0fbbe5ae7c 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -774,7 +774,18 @@ abstract class driver implements driver_interface if (!empty($array['WHERE'])) { - $sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']); + $sql .= ' WHERE '; + + if (is_array($array['WHERE'])) + { + $sql_where = $this->_process_boolean_tree_first($array['WHERE']); + } + else + { + $sql_where = $array['WHERE']; + } + + $sql .= $this->_sql_custom_build('WHERE', $sql_where); } if (!empty($array['GROUP_BY'])) |