#1485504: fix _skipDelimitedStrings()

git-svn-id: https://svn.roundcube.net/trunk@1994 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 6 deletions

diff --git a/roundcubemail/program/lib/MDB2.php b/roundcubemail/program/lib/MDB2.php
index 776554182..5c4c8d2f9 100644
--- a/roundcubemail/program/lib/MDB2.php
+++ b/roundcubemail/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'])) {