[Svn] r1994 - trunk/roundcubemail/program/lib

trac at roundcube.net trac at roundcube.net
Mon Oct 20 08:41:54 CEST 2008


Author: alec
Date: 2008-10-20 01:41:54 -0500 (Mon, 20 Oct 2008)
New Revision: 1994

Modified:
   trunk/roundcubemail/program/lib/MDB2.php
Log:
#1485504: fix _skipDelimitedStrings()


Modified: trunk/roundcubemail/program/lib/MDB2.php
===================================================================
--- trunk/roundcubemail/program/lib/MDB2.php	2008-10-19 17:32:19 UTC (rev 1993)
+++ trunk/roundcubemail/program/lib/MDB2.php	2008-10-20 06:41:54 UTC (rev 1994)
@@ -2915,9 +2915,7 @@
         $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,10 @@
      */
     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'])) {

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list