From effc35fdbeb7dd721e34ae94c7470576fd7a6a4f Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 22 Oct 2008 07:40:04 +0000 Subject: [PATCH] #1485513: another MDB2 package fix in _skipDelimitedStrings() --- program/lib/MDB2.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/program/lib/MDB2.php b/program/lib/MDB2.php index 5c4c8d2f9..7b769ffba 100644 --- a/program/lib/MDB2.php +++ b/program/lib/MDB2.php @@ -3024,7 +3024,11 @@ class MDB2_Driver_Common extends PEAR return $err; } } - } while ($ignore['escape'] && $query[($end_quote - 1)] == $ignore['escape'] && $end_quote-1 != $start_quote); + } while ($ignore['escape'] + && $end_quote-1 != $start_quote + && $query[($end_quote - 1)] == $ignore['escape'] + && ($ignore['escape_pattern'] !== $ignore['escape'] + || $query[($end_quote - 2)] != $ignore['escape'])); $position = $end_quote + 1; return $position; }