diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-10 13:37:33 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-10 13:37:33 +0100 |
| commit | 37aa0e93bf7ae9aabd481b4f56bc397eecde07bd (patch) | |
| tree | e5d48c3ae9ca6aea4b9799fb836eb72aa78be0ac /application/config | |
| parent | d377082bab6685fac221a0e6add22b6ab5d5bcc2 (diff) | |
| parent | 16af6afe991381360439135ddb0735dab1280fed (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-issue-863
Diffstat (limited to 'application/config')
| -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'] = ''; |