diff options
| author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
| commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
| tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /system/database/DB.php | |
| parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
| parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) | |
Merge branch 'working'
Diffstat (limited to 'system/database/DB.php')
| -rwxr-xr-x | system/database/DB.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index 8bf1ba8ba..33207d885 100755 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -28,11 +28,11 @@ function &DB($params = '', $active_record_override = NULL) if (is_string($params) AND strpos($params, '://') === FALSE) { // Is the config file in the environment folder? - if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/database'.EXT)) + if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/database.php')) { - if ( ! file_exists($file_path = APPPATH.'config/database'.EXT)) + if ( ! file_exists($file_path = APPPATH.'config/database.php')) { - show_error('The configuration file database'.EXT.' does not exist.'); + show_error('The configuration file database.php does not exist.'); } } @@ -116,11 +116,11 @@ function &DB($params = '', $active_record_override = NULL) $active_record = $active_record_override; } - require_once(BASEPATH.'database/DB_driver'.EXT); + require_once(BASEPATH.'database/DB_driver.php'); if ( ! isset($active_record) OR $active_record == TRUE) { - require_once(BASEPATH.'database/DB_active_rec'.EXT); + require_once(BASEPATH.'database/DB_active_rec.php'); if ( ! class_exists('CI_DB')) { @@ -135,7 +135,7 @@ function &DB($params = '', $active_record_override = NULL) } } - require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver'.EXT); + require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver.php'); // Instantiate the DB adapter $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; |