From f684da8e932c8faf36e9c142768e0d97d6b65dec Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 2 Aug 2007 05:05:44 +0000 Subject: [PATCH] #13916 git-svn-id: file:///svn/phpbb/trunk@7995 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/db/oracle.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 {
  • [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.
  • [Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian
  • [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
    • +
  • [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
    • 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) {