diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-20 20:58:37 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-20 20:58:37 +0200 |
| commit | 394d8c5bd3e04bd7992793ca7c648f4306a9539d (patch) | |
| tree | d061b4339f2c3f30428256efae741ab04fd2bf6e /system/database/DB.php | |
| parent | 43194ea1af658914a89ca49aed4dca4617b9c4ff (diff) | |
| parent | d56be70257696d0bbf2dcc880888d8dc17cba21c (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/DB.php')
| -rwxr-xr-x[-rw-r--r--] | system/database/DB.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index 33207d885..8314d3b97 100644..100755 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -21,6 +21,8 @@ * @category Database * @author ExpressionEngine Dev Team * @link http://codeigniter.com/user_guide/database/ + * @param string + * @param bool Determines if active record should be used or not */ function &DB($params = '', $active_record_override = NULL) { @@ -35,7 +37,7 @@ function &DB($params = '', $active_record_override = NULL) show_error('The configuration file database.php does not exist.'); } } - + include($file_path); if ( ! isset($db) OR count($db) == 0) |