Call db_connect(TRUE) instead of db_pconnect() + some style changes
diff --git a/system/database/DB.php b/system/database/DB.php
index 7e6cd74..f8d0204 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -102,13 +102,13 @@
}
$params = array(
- 'dbdriver' => $dsn['scheme'],
- 'hostname' => isset($dsn['host']) ? rawurldecode($dsn['host']) : '',
- 'port' => isset($dsn['port']) ? rawurldecode($dsn['port']) : '',
- 'username' => isset($dsn['user']) ? rawurldecode($dsn['user']) : '',
- 'password' => isset($dsn['pass']) ? rawurldecode($dsn['pass']) : '',
- 'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : ''
- );
+ 'dbdriver' => $dsn['scheme'],
+ 'hostname' => isset($dsn['host']) ? rawurldecode($dsn['host']) : '',
+ 'port' => isset($dsn['port']) ? rawurldecode($dsn['port']) : '',
+ 'username' => isset($dsn['user']) ? rawurldecode($dsn['user']) : '',
+ 'password' => isset($dsn['pass']) ? rawurldecode($dsn['pass']) : '',
+ 'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : ''
+ );
// Were additional config items set?
if (isset($dsn['query']))
@@ -177,11 +177,7 @@
// Load the DB driver
$driver_file = BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver.php';
- if ( ! file_exists($driver_file))
- {
- show_error('Invalid DB driver');
- }
-
+ file_exists($driver_file) OR show_error('Invalid DB driver');
require_once($driver_file);
// Instantiate the DB adapter