Changeset 1991 in subversion

Timestamp:

Oct 18, 2008 5:17:36 PM (5 years ago)

Author:

alec

Message:

#1485504: applied two patches from MDB2's repository

File:

• trunk/roundcubemail/program/lib/MDB2.php (modified) (2 diffs)

trunk/roundcubemail/program/lib/MDB2.php

@@ -2916 +2916 @@
         $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);
@@ -3149 +3149 @@
     {
         return sprintf($this->options['seqname_format'],
-            preg_replace('/[^a-z0-9_\$.]/i', '_', $sqn));
+            preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn));
     }