aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2011-03-07 08:48:02 -0600
committerJosh Woody <a_jelly_doughnut@phpbb.com>2011-03-07 10:31:25 -0600
commitf6c6de45395e18a8e3c6091e4b3fcd02f8355a28 (patch)
tree605bfc064935f37affca12ff1761b7b75299147c
parent21c5e6f149fc7445974d9ee89b825a9e928cbc6e (diff)
downloadforums-f6c6de45395e18a8e3c6091e4b3fcd02f8355a28.tar
forums-f6c6de45395e18a8e3c6091e4b3fcd02f8355a28.tar.gz
forums-f6c6de45395e18a8e3c6091e4b3fcd02f8355a28.tar.bz2
forums-f6c6de45395e18a8e3c6091e4b3fcd02f8355a28.tar.xz
forums-f6c6de45395e18a8e3c6091e4b3fcd02f8355a28.zip
[ticket/9946] Allow storage of data >4kB on Oracle again
This fixes the fix to PHPBB3-9132, which introduced a fatal error on Oracle. PHPBB3-9946
-rw-r--r--phpBB/includes/db/oracle.php3
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))
{