summaryrefslogtreecommitdiffstats
path: root/application/config/database.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-12 22:38:46 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-12 22:38:46 +0100
commit432b13f8e168006eac9d551c0ac463dadd3ef803 (patch)
tree6635eda43e986e11bcf11a7d04df6ec3db81912d /application/config/database.php
parent2e430a3f3b160641c36037fbaf92457e0b3bb51e (diff)
parentde7da338e21885b9ecc4f5a64ba77ee8475960d2 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-cubrid
Diffstat (limited to 'application/config/database.php')
-rw-r--r--application/config/database.php2
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'] = '';