diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-06-17 19:18:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-06-17 19:18:18 +0200 |
| commit | 389c24044a189aea5ae936c21b8df39cbb1b77f6 (patch) | |
| tree | bd2afb1cb19526b809081e6ec131208eb8a9291e /phpBB/includes/db | |
| parent | cf1b0202da836801238ae6be9614df3e8ec9851b (diff) | |
| parent | 6d248097e5422bf769fb3756e64e36e243865f79 (diff) | |
| download | forums-389c24044a189aea5ae936c21b8df39cbb1b77f6.tar forums-389c24044a189aea5ae936c21b8df39cbb1b77f6.tar.gz forums-389c24044a189aea5ae936c21b8df39cbb1b77f6.tar.bz2 forums-389c24044a189aea5ae936c21b8df39cbb1b77f6.tar.xz forums-389c24044a189aea5ae936c21b8df39cbb1b77f6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
[ticket/9606] Optimize unread search option.
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/oracle.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index 55b3599800..5a9b18abf0 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -261,6 +261,10 @@ class dbal_oracle extends dbal { $cols = explode(', ', $regs[2]); +/* 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)) @@ -310,6 +314,7 @@ class dbal_oracle extends dbal $vals = array(0 => $vals); } +*/ $inserts = $vals[0]; unset($vals); |