diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-07-05 09:39:04 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-07-05 09:39:04 +0200 |
| commit | 57570068139ba1e93d81b54b8d6e006cd107257f (patch) | |
| tree | 3ea2f4357a45e6eb52d3014c1789b2fd4a9349ec | |
| parent | 91cb3176dbcd1a34e7d99c6dce355e555be8c93a (diff) | |
| parent | f5a8530cc937d193aa928bc25f2970eae772d6ef (diff) | |
Merge pull request #1577 from rebizu/develop
I added so the DB.php is aware of database config files in packages.
| -rw-r--r-- | system/database/DB.php | 17 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index 00d14b43e..3044ce517 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -47,6 +47,21 @@ function &DB($params = '', $query_builder_override = NULL) } 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 ( ! isset($db) OR count($db) === 0) { @@ -166,4 +181,4 @@ function &DB($params = '', $query_builder_override = NULL) } /* End of file DB.php */ -/* Location: ./system/database/DB.php */
\ No newline at end of file +/* Location: ./system/database/DB.php */ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index e5c46ff93..9a7cec320 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -137,6 +137,7 @@ Release Date: Not Released - 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 |