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;
                 }