diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-24 09:22:12 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-24 09:22:12 +0100 |
| commit | 6ac93d8a00ba54158e429fdfd29f356805781cfc (patch) | |
| tree | d6dcd55fe9ce5159ecc758ecdc4ed98a37dfb287 /phpBB/includes/db/oracle.php | |
| parent | df6ce22fa300a9721d20f0f0f770d0d721e43164 (diff) | |
| parent | f6c6de45395e18a8e3c6091e4b3fcd02f8355a28 (diff) | |
| download | forums-6ac93d8a00ba54158e429fdfd29f356805781cfc.tar forums-6ac93d8a00ba54158e429fdfd29f356805781cfc.tar.gz forums-6ac93d8a00ba54158e429fdfd29f356805781cfc.tar.bz2 forums-6ac93d8a00ba54158e429fdfd29f356805781cfc.tar.xz forums-6ac93d8a00ba54158e429fdfd29f356805781cfc.zip | |
Merge branch 'ticket/jellydoughnut/9946' into develop-olympus
* ticket/jellydoughnut/9946:
[ticket/9946] Allow storage of data >4kB on Oracle again
Diffstat (limited to 'phpBB/includes/db/oracle.php')
| -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 c8a9a5f604..62b36aa8bf 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)) { |