diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-02-10 13:33:28 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-02-10 13:33:28 +0100 |
commit | 6b7368f61761d8fd177ab752c6bea829f0ca2ea5 (patch) | |
tree | bc801f54de79a714f80ef2a38febe33cb7af9374 /application/config | |
parent | 8d7fffc9f0aa49d7bf306060f0676a7b28b7c808 (diff) | |
parent | 16af6afe991381360439135ddb0735dab1280fed (diff) |
Merge remote-tracking branch 'upstream/develop' into develop-image-lib
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'] = ''; |