diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-08-02 05:05:44 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-08-02 05:05:44 +0000 |
| commit | f684da8e932c8faf36e9c142768e0d97d6b65dec (patch) | |
| tree | b779bce84f697ace315bddbc0fcb922b48013f0a | |
| parent | 5ed0be15abe090c426114240f06a01005edfefea (diff) | |
| download | forums-f684da8e932c8faf36e9c142768e0d97d6b65dec.tar forums-f684da8e932c8faf36e9c142768e0d97d6b65dec.tar.gz forums-f684da8e932c8faf36e9c142768e0d97d6b65dec.tar.bz2 forums-f684da8e932c8faf36e9c142768e0d97d6b65dec.tar.xz forums-f684da8e932c8faf36e9c142768e0d97d6b65dec.zip | |
#13916
git-svn-id: file:///svn/phpbb/trunk@7995 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/db/oracle.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8ca4d0a6e3..27cc0f0e1e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -200,6 +200,7 @@ p a { <li>[Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favor of append_sid() with the exact same parameters if present.</li> <li>[Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian</li> <li>[Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)</li> + <li>[Fix] Properly parse SQL expressions for Oracle (Bug #13916)</li> </ul> diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index 6049fa5734..18af5cbab0 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -115,7 +115,7 @@ class dbal_oracle extends dbal */ function _rewrite_where($where_clause) { - preg_match_all('/\s*(AND|OR)?\s*([\w_.]++)\s*(?:(=|<>)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER); + preg_match_all('/\s*(AND|OR)?\s*([\w_.]++)\s*(?:(=|<[=>]?|>=?)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER); $out = ''; foreach ($result as $val) { |