2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index d9a7298c04..bef33b4fd2 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -314,12 +314,12 @@ class dbal_oracle extends dbal
 				$stmt = @ociparse($this->db_connect_id, $query);
 				@ociexecute($stmt, OCI_DEFAULT );
 
-				$temp_result = @ocifetchinto($stmt, $temp_result, OCI_ASSOC + OCI_RETURN_NULLS);
+				$temp_result = @ocifetchinto($stmt, $temp_array, OCI_ASSOC + OCI_RETURN_NULLS);
 				@ocifreestatement($stmt);
 
 				if ($temp_result)
 				{
-					return $temp_result['CURRVAL'];
+					return $temp_array['CURRVAL'];
 				}
 				else
 				{
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index d4eb271260..82479f0fcf 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1792,7 +1792,8 @@ function remove_remarks(&$sql)
 function split_sql_file($sql, $delimiter)
 {
 	$sql = str_replace("\r" , '', $sql);
-	$data = preg_split('/' . $delimiter . '$/m', $sql);
+	$data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
+
 	foreach ($data as $key => $value)
 	{
 		$data[$key] = trim($value);