diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-11-29 09:30:36 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-11-29 09:30:36 +0000 |
| commit | 205c5b2415deb10d4afba32249e7f5f989a097b1 (patch) | |
| tree | cb11740ba304151ee86922768e62d4a269e74d19 /includes/database/mysql/database.inc | |
| parent | 9b391c2e6ec9eee45a4ac701e3ee5104372b04d8 (diff) | |
| download | brdo-205c5b2415deb10d4afba32249e7f5f989a097b1.tar.gz brdo-205c5b2415deb10d4afba32249e7f5f989a097b1.tar.bz2 | |
- Patch #337926 by hswong3i, Dave Reid, Damien Tournoud: forced connection with PDF:CASE_LOWER.
Diffstat (limited to 'includes/database/mysql/database.inc')
| -rw-r--r-- | includes/database/mysql/database.inc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc index 23470abc3..82c962929 100644 --- a/includes/database/mysql/database.inc +++ b/includes/database/mysql/database.inc @@ -13,15 +13,11 @@ class DatabaseConnection_mysql extends DatabaseConnection { - protected $transactionSupport; + protected $transactionSupport = FALSE; public function __construct(Array $connection_options = array()) { - - $connection_options += array( - 'transactions' => FALSE, - 'port' => 3306, - ); - $this->transactionSupport = $connection_options['transactions']; + $this->transactionSupport = isset($connection_options['transactions']) ? $connection_options['transactions'] : FALSE; + $connection_options['port'] = !empty($connection_options['port']) ? $connection_options['port'] : 3306; $dsn = 'mysql:host=' . $connection_options['host'] . ';port=' . $connection_options['port'] . ';dbname=' . $connection_options['database']; parent::__construct($dsn, $connection_options['username'], $connection_options['password'], array( |