diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-22 07:40:04 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-22 07:40:04 +0000 |
| commit | 3d3f92f30e52502fa566d07fc32a1ecee8f975b3 (patch) | |
| tree | ca4dd5c801f37440b09abf2328fea6593036a9ac /roundcubemail/program | |
| parent | 183597448d6f355122f5bf49d5af55e2087e6280 (diff) | |
#1485513: another MDB2 package fix in _skipDelimitedStrings()
git-svn-id: https://svn.roundcube.net/trunk@2001 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/lib/MDB2.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/roundcubemail/program/lib/MDB2.php b/roundcubemail/program/lib/MDB2.php index 5c4c8d2f9..7b769ffba 100644 --- a/roundcubemail/program/lib/MDB2.php +++ b/roundcubemail/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;
}
|