aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/oracle.php
diff options
context:
space:
mode:
authorMaat <maat-pub@mageia.biz>2012-06-03 21:23:14 +0200
committerMaat <maat-pub@mageia.biz>2012-06-03 21:23:14 +0200
commita06a38ae692551dc1c0416b835ce9924b3d9f7f5 (patch)
tree1bb2c2b3d8d56668585513890afc1d641cead0b1 /phpBB/includes/db/oracle.php
parent2db884ac2e5122be1db0582b76bf7204783a0c0d (diff)
parent19a47dfbbc4265e33c14d6679b5693d80120db4b (diff)
downloadforums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar
forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar.gz
forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar.bz2
forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.tar.xz
forums-a06a38ae692551dc1c0416b835ce9924b3d9f7f5.zip
Merging with upstream 3.0.11
Diffstat (limited to 'phpBB/includes/db/oracle.php')
-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))
{