diff options
author | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
---|---|---|
committer | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
commit | f5311f105f6e708d89d9c92c4104dd911cf8be26 (patch) | |
tree | 271a431c9464250d15a880ede0b17cfb2d111e7f /application/config/autoload.php | |
parent | 3e1286b00d0bdd37e649fdb706cd7dfddc25447d (diff) | |
parent | 4b9fec6797db2aea3af8ca4080be73e2ff421080 (diff) |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'application/config/autoload.php')
-rw-r--r-- | application/config/autoload.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/application/config/autoload.php b/application/config/autoload.php index 3f0bd24f2..4bc6bf0ad 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -45,8 +45,9 @@ $autoload['packages'] = array(); | ------------------------------------------------------------------- | Auto-load Libraries | ------------------------------------------------------------------- -| These are the classes located in the system/libraries folder -| or in your application/libraries folder. +| These are the classes located in system/libraries/ or your +| application/libraries/ directory, with the addition of the +| 'database' library, which is somewhat of a special case. | | Prototype: | @@ -63,8 +64,9 @@ $autoload['libraries'] = array(); | ------------------------------------------------------------------- | Auto-load Drivers | ------------------------------------------------------------------- -| These classes are located in the system/libraries folder or in your -| application/libraries folder within their own subdirectory. They +| These classes are located in system/libraries/ or in your +| application/libraries/ directory, but are also placed inside their +| own subdirectory and they extend the CI_Driver_Library class. They | offer multiple interchangeable driver options. | | Prototype: |