code cleanup and changelog added
diff --git a/system/database/DB.php b/system/database/DB.php
index fd5cf55..3044ce5 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -49,19 +49,19 @@
include($file_path);
//make packages contain database config files
foreach(get_instance()->load->get_package_paths() as $path)
- {
- if ($path != APPPATH)
- {
- if ( file_exists($file_path = $path.'config/'.ENVIRONMENT.'/database.php'))
- {
- include($file_path);
- }
- elseif ( file_exists($file_path = $path.'config/database.php'))
- {
- include($file_path);
- }
- }
- }
+ {
+ if ($path !== APPPATH)
+ {
+ if (file_exists ($file_path = $path.'config/'.ENVIRONMENT.'/database.php'))
+ {
+ include ($file_path);
+ }
+ elseif ( file_exists ($file_path = $path.'config/database.php'))
+ {
+ include ($file_path);
+ }
+ }
+ }
if ( ! isset($db) OR count($db) === 0)
{
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e5c46ff..9a7cec3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -137,6 +137,7 @@
- Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge <database/forge>`.
- Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
- Added PDO support for ``list_fields()`` in :doc:`Database Results <database/results>`.
+ - Added capability for packages to hold database.php config files
- Libraries