diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/drivers/DB_active_record.php | 2 | ||||
| -rw-r--r-- | system/drivers/DB_driver.php | 8 | ||||
| -rw-r--r-- | system/libraries/Controller.php | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/system/drivers/DB_active_record.php b/system/drivers/DB_active_record.php index af12d9d27..c038185bc 100644 --- a/system/drivers/DB_active_record.php +++ b/system/drivers/DB_active_record.php @@ -24,7 +24,7 @@ * @subpackage Drivers * @category Database * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/libraries/database/ + * @link http://www.codeigniter.com/user_guide/database/ */ class CI_DB_active_record extends CI_DB_driver { diff --git a/system/drivers/DB_driver.php b/system/drivers/DB_driver.php index a1ec14b06..48f7c4a9a 100644 --- a/system/drivers/DB_driver.php +++ b/system/drivers/DB_driver.php @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/libraries/database/ + * @link http://www.codeigniter.com/user_guide/database/ */ class CI_DB_driver { @@ -625,7 +625,7 @@ class CI_DB_driver { } return $this->_field_data($this->dbprefix.$table); - } + } // -------------------------------------------------------------------- @@ -806,7 +806,7 @@ class CI_DB_driver { if ( ! class_exists('CI_Exceptions')) { - include_once(BASEPATH.'libraries/Exceptions.php'); + include_once(BASEPATH.'libraries/Exceptions'.EXT); } $error = new CI_Exceptions(); @@ -827,7 +827,7 @@ class CI_DB_driver { * * @category Database * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/libraries/database/ + * @link http://www.codeigniter.com/user_guide/database/ */ class CI_DB_result { diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 0dd6ee6a4..5be10500b 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -362,11 +362,11 @@ class Controller extends CI_Base { $params['active_r'] = TRUE; } - require_once(BASEPATH.'drivers/DB_driver'.EXT); + require_once(BASEPATH.'database/DB_driver'.EXT); if ( ! isset($params['active_r']) OR $params['active_r'] == TRUE) { - require_once(BASEPATH.'drivers/DB_active_record'.EXT); + require_once(BASEPATH.'database/DB_active_record'.EXT); if ( ! class_exists('CI_DB')) { @@ -381,7 +381,7 @@ class Controller extends CI_Base { } } - require_once(BASEPATH.'drivers/DB_'.$params['dbdriver'].EXT); + require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].EXT); // Instantiate the DB adapter $driver = 'CI_DB_'. $params['dbdriver']; |