Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2014-03-05 aa058736111255cfd43e75d1c340d23879663ee2

 program/lib/Roundcube/rcube_db_mysql.php

@@ -128,11 +128,11 @@
        $result = array();

        if (!empty($dsn['key'])) {
            $result[PDO::MYSQL_ATTR_KEY] = $dsn['key'];
            $result[PDO::MYSQL_ATTR_SSL_KEY] = $dsn['key'];
        }

        if (!empty($dsn['cipher'])) {
            $result[PDO::MYSQL_ATTR_CIPHER] = $dsn['cipher'];
            $result[PDO::MYSQL_ATTR_SSL_CIPHER] = $dsn['cipher'];
        }

        if (!empty($dsn['cert'])) {