summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-10 13:40:14 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-10 13:40:14 +0100
commita563fac0fb822169eb4ee8a5f98324bdab15321b (patch)
tree485445b9af5d8ec16de8bb0cea0e7260f3d8db7c /application/config
parent569091cf6ad7101059e6a4ffbd93f227aad9937f (diff)
parent16af6afe991381360439135ddb0735dab1280fed (diff)
Merge upstream branch
Diffstat (limited to 'application/config')
-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'] = '';