diff options
| author | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
| commit | fa337081ced1b1d34805d28f8307f069edf16cdf (patch) | |
| tree | 63e524a282d7a8efef45b205c42f9b8e4a06b89b /tests/mocks/database/db.php | |
| parent | 6bf1e50bdff62d4842cd5a94d324e0768c5ace3e (diff) | |
| parent | 78e5fdfe4399975b75b8697f64e270b1799ee2f1 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'tests/mocks/database/db.php')
| -rw-r--r-- | tests/mocks/database/db.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/mocks/database/db.php b/tests/mocks/database/db.php index 30504bba6..75658530b 100644 --- a/tests/mocks/database/db.php +++ b/tests/mocks/database/db.php @@ -45,9 +45,9 @@ class Mock_Database_DB { ); $config = array_merge($this->config[$group], $params); - $dsnstring = ( ! empty($config['dsn'])) ? $config['dsn'] : FALSE; - $pdodriver = ( ! empty($config['pdodriver'])) ? $config['pdodriver'] : FALSE; - $failover = ( ! empty($config['failover'])) ? $config['failover'] : FALSE; + $dsnstring = empty($config['dsn']) ? FALSE : $config['dsn']; + $subdriver = empty($config['subdriver']) ? FALSE: $config['subdriver']; + $failover = empty($config['failover']) ? FALSE : $config['failover']; $dsn = $config['dbdriver'].'://'.$config['username'].':'.$config['password'] .'@'.$config['hostname'].'/'.$config['database']; @@ -55,7 +55,7 @@ class Mock_Database_DB { // Build the parameter $other_params = array_slice($config, 6); if ($dsnstring) $other_params['dsn'] = $dsnstring; - if ($pdodriver) $other_params['pdodriver'] = $pdodriver; + if ($subdriver) $other_params['subdriver'] = $subdriver; if ($failover) $other_params['failover'] = $failover; return $dsn.'?'.http_build_query($other_params); |