diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-02-24 14:14:19 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-02-24 14:16:18 +0100 |
| commit | 1c715f79b4e3fdc3b80d27f8fc0bcdde2b0dfed8 (patch) | |
| tree | e97934c7be0a1448f98d5d0dd0d22d6a4ae751f8 | |
| parent | 55d9d5e0b7c75d7a4a2f59a76a8fdc793bf78b43 (diff) | |
Fix some PDO::MYSQL_* constants (wrongly described in PHP manual before 5.3.21)
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_db_mysql.php | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,7 @@ REQUIREMENTS * PHP Version 5.2.1 or greater including - PCRE, DOM, JSON, XML, Session, Sockets (required) - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required) - Note: MySQL database driver requires PHP 5.3 or newer. + Note: MySQL database driver requires PHP 5.3.7 or newer. - Libiconv, Zip (recommended) - Fileinfo, Mcrypt, mbstring (optional) * PEAR packages distributed with Roundcube or external: diff --git a/program/lib/Roundcube/rcube_db_mysql.php b/program/lib/Roundcube/rcube_db_mysql.php index d3d0ac5c8..e6417cc0a 100644 --- a/program/lib/Roundcube/rcube_db_mysql.php +++ b/program/lib/Roundcube/rcube_db_mysql.php @@ -128,11 +128,11 @@ class rcube_db_mysql extends rcube_db $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'])) { |