diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-10-24 14:36:41 +0100 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-11-11 08:38:37 +0000 |
| commit | bb260f02e0de549f0ac2327b1d7b4f4a236a9a2a (patch) | |
| tree | 8acd6b4858872779aec76b2f041fff19f9818e01 /phpBB/phpbb/db/driver/driver.php | |
| parent | 6806c20bce1eedeee6daafe466e2801c7508fcad (diff) | |
| download | forums-bb260f02e0de549f0ac2327b1d7b4f4a236a9a2a.tar forums-bb260f02e0de549f0ac2327b1d7b4f4a236a9a2a.tar.gz forums-bb260f02e0de549f0ac2327b1d7b4f4a236a9a2a.tar.bz2 forums-bb260f02e0de549f0ac2327b1d7b4f4a236a9a2a.tar.xz forums-bb260f02e0de549f0ac2327b1d7b4f4a236a9a2a.zip | |
[feature/sql-bool-builder] Changing syntax
Changing the syntax used to the one Nicofuma suggested.
PHPBB3-13652
Diffstat (limited to 'phpBB/phpbb/db/driver/driver.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 7e2d7a5ea6..410dd17b32 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -812,16 +812,16 @@ abstract class driver implements driver_interface if ($operations_ary[0] !== 'AND' && $operations_ary[0] !== 'OR') { - $operations_ary = array('AND', $operations_ary); + $operations_ary = array('AND', array($operations_ary)); } return $this->_process_boolean_tree($operations_ary) . "\n"; } protected function _process_boolean_tree($operations_ary) { - $operation = array_shift($operations_ary); + $operation = $operations_ary[0]; - foreach ($operations_ary as &$condition) + foreach ($operations_ary[1] as &$condition) { switch ($condition[0]) { @@ -917,11 +917,11 @@ abstract class driver implements driver_interface if ($operation === 'NOT') { - $operations_ary = implode("", $operations_ary); + $operations_ary = implode("", $operations_ary[1]); } else { - $operations_ary = implode(" \n $operation ", $operations_ary); + $operations_ary = implode(" \n $operation ", $operations_ary[1]); } return $operations_ary; |