From 205c5b2415deb10d4afba32249e7f5f989a097b1 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 29 Nov 2008 09:30:36 +0000
Subject: - Patch #337926 by hswong3i, Dave Reid, Damien Tournoud: forced
 connection with PDF:CASE_LOWER.

---
 includes/database/mysql/database.inc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'includes/database/mysql')

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(
-- 
cgit v1.2.3