diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-12 02:29:33 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-12 02:29:33 +0100 |
| commit | f94c540435605d7cc6e0d6fbfc68914d29eba6c6 (patch) | |
| tree | 312b854acca36750a270df8720dd0f6cca0fb3db /application | |
| parent | 7e93489fed826286abe2d0b5abd65badc13beab9 (diff) | |
| parent | 16af6afe991381360439135ddb0735dab1280fed (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-db-odbc
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/database.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/application/config/database.php b/application/config/database.php index 7eac59b23..bd68db1d8 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -37,6 +37,7 @@ | EXPLANATION OF VARIABLES | ------------------------------------------------------------------- | +| ['dsn'] The full DSN string describe a connection to the database. | ['hostname'] The hostname of your database server. | ['username'] The username used to connect to the database | ['password'] The password used to connect to the database @@ -74,6 +75,7 @@ $active_group = 'default'; $active_record = TRUE; +$db['default']['dsn'] = ''; $db['default']['hostname'] = 'localhost'; $db['default']['username'] = ''; $db['default']['password'] = ''; |