From 1ad39efbf4047285dd84762eb9dc55ebcd00b0a2 Mon Sep 17 00:00:00 2001 From: alecpl Date: Mon, 20 Oct 2008 06:41:54 +0000 Subject: #1485504: fix _skipDelimitedStrings() --- program/lib/MDB2.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'program/lib/MDB2.php') diff --git a/program/lib/MDB2.php b/program/lib/MDB2.php index 776554182..5c4c8d2f9 100644 --- a/program/lib/MDB2.php +++ b/program/lib/MDB2.php @@ -2915,9 +2915,7 @@ class MDB2_Driver_Common extends PEAR $colon = ':'; $positions = array(); $position = 0; - $ignores = $this->string_quoting; - $ignores[] = $this->identifier_quoting; - $ignores[] = $this->sql_comments; + while ($position < strlen($query)) { $q_position = strpos($query, $question, $position); $c_position = strpos($query, $colon, $position); @@ -3008,9 +3006,9 @@ class MDB2_Driver_Common extends PEAR */ function _skipDelimitedStrings($query, $position, $p_position) { - $ignores = $this->string_quoting; - $ignores[] = $this->identifier_quoting; - $ignores[] = $this->sql_comments; + $ignores[] = $this->string_quoting; + $ignores[] = $this->identifier_quoting; + $ignores = array_merge($ignores, $this->sql_comments); foreach ($ignores as $ignore) { if (!empty($ignore['start'])) { -- cgit v1.2.3