diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-07-09 15:33:38 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-07-09 15:33:38 +0000 |
| commit | 8f7a4d27c67630d9bf29bc7c9455aa96bc409ed1 (patch) | |
| tree | a64e23ba3a292954d2215f1d4d0a41de56b61a4c | |
| parent | 179c77ccddcd8bd4df2f29d05b460c6365396d49 (diff) | |
| download | forums-8f7a4d27c67630d9bf29bc7c9455aa96bc409ed1.tar forums-8f7a4d27c67630d9bf29bc7c9455aa96bc409ed1.tar.gz forums-8f7a4d27c67630d9bf29bc7c9455aa96bc409ed1.tar.bz2 forums-8f7a4d27c67630d9bf29bc7c9455aa96bc409ed1.tar.xz forums-8f7a4d27c67630d9bf29bc7c9455aa96bc409ed1.zip | |
#13151
git-svn-id: file:///svn/phpbb/trunk@7849 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/db/oracle.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 1b4cbf8f91..3a444d7294 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -186,9 +186,10 @@ p a { <div class="paragraph"> <ul class="menu"> - <li>[Fix] Parse error in MCP ban (Bug #13109)</li> + <li>[Fix] Parse error in MCP ban (Bug #13109)</li> <li>[Fix] Correctly hide online status in the profile (Bug #13059)</li> <li>[Feature] Let the user choose how to update modified files (merging, using new file or using old file) within automatic updater</li> + <li>[Feature] An extra \ in an Oracle SQL regex was corrected (Bug #13151)</li> </ul> diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index 888a9fd4bf..6049fa5734 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -239,7 +239,7 @@ class dbal_oracle extends dbal if (strlen($regs[3]) > 4000) { $cols = explode(', ', $regs[2]); - preg_match_all('/\'(?:[^\']++|\'\')*+\'|\[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER); + preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER); $inserts = $vals[0]; unset($vals); |