summaryrefslogtreecommitdiffstats
path: root/system/libraries/Controller.php
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-04 02:36:18 +0200
committeradmin <devnull@localhost>2006-10-04 02:36:18 +0200
commit6871d95930a148722f2b99fa80ef6dd44f86f078 (patch)
tree437943b180887c151bdf38fdc4d0869520a1919f /system/libraries/Controller.php
parent7b6fe7a1cdda513700aeabeba67389d016d0527a (diff)
Diffstat (limited to 'system/libraries/Controller.php')
-rw-r--r--system/libraries/Controller.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index c02074fca..6a3ea9962 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -430,6 +430,7 @@ class Controller extends CI_Base {
* @access private
* @param mixed database connection values
* @param bool whether to return the object for multiple connections
+ * @param bool whether to load the active record class
* @return void
*/
function _ci_init_database($params = '', $return = FALSE, $active_record = FALSE)
@@ -439,7 +440,7 @@ class Controller extends CI_Base {
return;
}
- // Load the DB config file if needed
+ // Load the DB config file if needed. We'll test for a DSN string
if (is_string($params) AND strpos($params, '://') === FALSE)
{
include(APPPATH.'config/database'.EXT);