1 files changed, 40 insertions, 34 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index 21585e5899..9c0491d8c8 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -110,54 +110,60 @@ class dbal_oracle extends dbal
 					$in_transaction = true;
 				}
 
-				$array = array();
-
 				// We overcome Oracle's 4000 char limit by binding vars
-				if (preg_match('/^(INSERT INTO[^(]+)\\(([^()]+)\\) VALUES[^(]+\\((.*?)\\)$/s', $query, $regs))
+				if (strlen($query) > 4000)
 				{
-					if (strlen($regs[3]) > 4000)
+					$array = array();
+
+					if (preg_match('/^(INSERT INTO[^(]+)\\(([^()]+)\\) VALUES[^(]+\\((.*?)\\)$/s', $query, $regs))
 					{
-						$cols = explode(', ', $regs[2]);
-						preg_match_all('/\'(?:[^\']++|\'\')*+\'|\\d+/', $regs[3], $vals, PREG_PATTERN_ORDER);
+						if (strlen($regs[3]) > 4000)
+						{
+							$cols = explode(', ', $regs[2]);
+							preg_match_all('/\'(?:[^\']++|\'\')*+\'|\\d+/', $regs[3], $vals, PREG_PATTERN_ORDER);
 
-						$inserts = $vals[0];
-						unset($vals);
+							$inserts = $vals[0];
+							unset($vals);
 
-						foreach ($inserts as $key => $value)
-						{
-							if (!empty($value) && $value[0] === "'" && strlen($value) > 4002) // check to see if this thing is greater than the max + 'x2
+							foreach ($inserts as $key => $value)
 							{
-								$inserts[$key] = ':' . strtoupper($cols[$key]);
-								$array[$inserts[$key]] = str_replace("''", "'", substr($value, 1, -1));
+								if (!empty($value) && $value[0] === "'" && strlen($value) > 4002) // check to see if this thing is greater than the max + 'x2
+								{
+									$inserts[$key] = ':' . strtoupper($cols[$key]);
+									$array[$inserts[$key]] = str_replace("''", "'", substr($value, 1, -1));
+								}
 							}
+
+							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
+							unset($art);
 						}
-						$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
 					}
-				}
-				else if (preg_match_all('/^(UPDATE [\\w_]++\\s+SET )(\\w+ = (?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:, \\w+ = (?:\'(?:[^\']++|\'\')*+\'|\\d+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER))
-				{
-					if (strlen($data[0][2]) > 4000)
+					else if (preg_match_all('/^(UPDATE [\\w_]++\\s+SET )(\\w+ = (?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:, \\w+ = (?:\'(?:[^\']++|\'\')*+\'|\\d+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER))
 					{
-						$update = $data[0][1];
-						$where = $data[0][3];
-						preg_match_all('/(\\w++) = (\'(?:[^\']++|\'\')*+\'|\\d++)/', $data[0][2], $temp, PREG_SET_ORDER);
-						unset($data);
-
-						$art = array();
-						foreach ($temp as $value)
+						if (strlen($data[0][2]) > 4000)
 						{
-							if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 4002) // check to see if this thing is greater than the max + 'x2
-							{
-								$art[] = $value[1] . '=:' . strtoupper($value[1]);
-								$array[$cols[$value[1]]] = str_replace("''", "'", substr($value[2], 1, -1));
-							}
-							else
+							$update = $data[0][1];
+							$where = $data[0][3];
+							preg_match_all('/(\\w++) = (\'(?:[^\']++|\'\')*+\'|\\d++)/', $data[0][2], $temp, PREG_SET_ORDER);
+							unset($data);
+
+							$art = array();
+							foreach ($temp as $value)
 							{
-								$art[] = $value[1] . '=' . $value[2];
+								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 4002) // check to see if this thing is greater than the max + 'x2
+								{
+									$art[] = $value[1] . '=:' . strtoupper($value[1]);
+									$array[$value[1]] = str_replace("''", "'", substr($value[2], 1, -1));
+								}
+								else
+								{
+									$art[] = $value[1] . '=' . $value[2];
+								}
 							}
-						}
 
-						$query = $update . implode(', ', $art) . ' ' . $where;
+							$query = $update . implode(', ', $art) . ' ' . $where;
+							unset($art);
+						}
 					}
 				}