From 7c693a26fb6d34b389c4a2dc0a278f7978191da2 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 25 Apr 2007 06:55:10 +0000
Subject: [PATCH]

---
 dibi/drivers/mysql.php | 10 +++++-----
 dibi/drivers/pdo.php   |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index ebfb9cf..ce3c87b 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -51,11 +51,6 @@ class DibiMySqlDriver extends DibiDriver
             if (empty($config['host'])) $config['host'] = 'localhost';
         }
 
-        if (isset($config['protocol']) && $config['protocol'] === 'unix')  // host can be socket
-            $host = ':' . $config['host'];
-        else
-            $host = $config['host'] . (empty($config['port']) ? '' : ':'.$config['port']);
-
         parent::__construct($config);
     }
 
@@ -65,6 +60,11 @@ class DibiMySqlDriver extends DibiDriver
     {
         $config = $this->config;
 
+        if (isset($config['protocol']) && $config['protocol'] === 'unix')  // host can be socket
+            $host = ':' . $config['host'];
+        else
+            $host = $config['host'] . (empty($config['port']) ? '' : ':'.$config['port']);
+
         // some errors aren't handled. Must use $php_errormsg
         if (function_exists('ini_set'))
             $save = ini_set('track_errors', TRUE);
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index d9eadc7..b3e5065 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -54,8 +54,7 @@ class DibiPdoDriver extends DibiDriver
 
     protected function connect()
     {
-        $config = $this->config;
-        return new PDO($config['dsn'], $config['username'], $config['password']);
+        return new PDO($this->config['dsn'], $this->config['username'], $this->config['password']);
     }