#1485504: applied two patches from MDB2's repository

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

1 files changed, 3 insertions, 3 deletions

diff --git a/roundcubemail/program/lib/MDB2.php b/roundcubemail/program/lib/MDB2.php
index 7e4732266..776554182 100644
--- a/roundcubemail/program/lib/MDB2.php
+++ b/roundcubemail/program/lib/MDB2.php
@@ -2915,9 +2915,9 @@ class MDB2_Driver_Common extends PEAR
         $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 @@ class MDB2_Driver_Common extends PEAR
     function getSequenceName($sqn)

     {

         return sprintf($this->options['seqname_format'],

-            preg_replace('/[^a-z0-9_\$.]/i', '_', $sqn));

+            preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn));

     }

 

     // }}}