diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
| commit | 399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch) | |
| tree | 592188568e15325d59e51bf19cfdf667fae8d86d /system/config/database.php | |
| parent | 925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff) | |
| parent | 64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'system/config/database.php')
| -rw-r--r-- | system/config/database.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/system/config/database.php b/system/config/database.php index 6519156a..36e4614c 100644 --- a/system/config/database.php +++ b/system/config/database.php @@ -25,7 +25,7 @@ */ $config['default'] = array ( - 'benchmark' => TRUE, + 'benchmark' => FALSE, 'persistent' => FALSE, 'connection' => array ( @@ -35,7 +35,8 @@ $config['default'] = array 'host' => 'localhost', 'port' => FALSE, 'socket' => FALSE, - 'database' => 'kohana' + 'database' => 'kohana', + 'params' => NULL, ), 'character_set' => 'utf8', 'table_prefix' => '', |