diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
| commit | 693a2dc99bf07aeac1865d4a48ddf2589317ac7a (patch) | |
| tree | 8bd926d3671dc9de0a72d4025aaa625a18ba51e1 /phpBB/includes/db/firebird.php | |
| parent | b68de2323d6444b4b3685a98bbcb9500a38e45cb (diff) | |
| parent | ac329275662f737f03f485107cb69412739c1afa (diff) | |
| download | forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.gz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.bz2 forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.xz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.zip | |
Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
Diffstat (limited to 'phpBB/includes/db/firebird.php')
| -rw-r--r-- | phpBB/includes/db/firebird.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index fb1ef44c55..e554b0f2fb 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -451,6 +451,11 @@ class dbal_firebird extends dbal return 'BIN_AND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : ''); } + function _sql_bit_or($column_name, $bit, $compare = '') + { + return 'BIN_OR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : ''); + } + /** * return sql error array * @access private |