diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-24 09:22:36 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-24 09:22:36 +0100 |
| commit | 3a0a18ee25d1f44be258dff49619a061865d8f24 (patch) | |
| tree | e6609eb8dfbd9b688a8be566987afb9481ea8c1c | |
| parent | 1312e5b9650f9309142099ba2fe1a5738c43630e (diff) | |
| parent | 6ac93d8a00ba54158e429fdfd29f356805781cfc (diff) | |
| download | forums-3a0a18ee25d1f44be258dff49619a061865d8f24.tar forums-3a0a18ee25d1f44be258dff49619a061865d8f24.tar.gz forums-3a0a18ee25d1f44be258dff49619a061865d8f24.tar.bz2 forums-3a0a18ee25d1f44be258dff49619a061865d8f24.tar.xz forums-3a0a18ee25d1f44be258dff49619a061865d8f24.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9946] Allow storage of data >4kB on Oracle again
| -rw-r--r-- | phpBB/includes/db/oracle.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index fc2e35e13c..e0d9370bd8 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -269,11 +269,12 @@ class dbal_oracle extends dbal { $cols = explode(', ', $regs[2]); + preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER); + /* The code inside this comment block breaks clob handling, but does allow the database restore script to work. If you want to allow no posts longer than 4KB and/or need the db restore script, uncomment this. - preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER); if (sizeof($cols) !== sizeof($vals)) { |