summaryrefslogtreecommitdiff
path: root/program/lib/MDB2.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-22 07:40:04 +0000
committeralecpl <alec@alec.pl>2008-10-22 07:40:04 +0000
commiteffc35fdbeb7dd721e34ae94c7470576fd7a6a4f (patch)
tree1a122eac6be4c0def3fa95167a662da5a61a2f7c /program/lib/MDB2.php
parentc2de4d01ba28b22e62c8eac5b402747207a5d5c5 (diff)
#1485513: another MDB2 package fix in _skipDelimitedStrings()
Diffstat (limited to 'program/lib/MDB2.php')
-rw-r--r--program/lib/MDB2.php6
1 files changed, 5 insertions, 1 deletions
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;
}