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