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

trac at roundcube.net trac at roundcube.net
Sat Oct 18 23:17:36 CEST 2008


Author: alec
Date: 2008-10-18 16:17:36 -0500 (Sat, 18 Oct 2008)
New Revision: 1991

Modified:
   trunk/roundcubemail/program/lib/MDB2.php
Log:
#1485504: applied two patches from MDB2's repository


Modified: trunk/roundcubemail/program/lib/MDB2.php
===================================================================
--- trunk/roundcubemail/program/lib/MDB2.php	2008-10-18 21:11:00 UTC (rev 1990)
+++ trunk/roundcubemail/program/lib/MDB2.php	2008-10-18 21:17:36 UTC (rev 1991)
@@ -2915,9 +2915,9 @@
         $colon = ':';
         $positions = array();
         $position = 0;
-        $ignores = $this->sql_comments;
-        $ignores[] = $this->string_quoting;
+        $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);
@@ -3148,7 +3148,7 @@
     function getSequenceName($sqn)
     {
         return sprintf($this->options['seqname_format'],
-            preg_replace('/[^a-z0-9_\$.]/i', '_', $sqn));
+            preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn));
     }
 
     // }}}

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



More information about the Svn mailing list