Skip to content

Commit 97f65f5

Browse files
committed
set db type in configuration
2 parents fd3ebab + 7ab7b05 commit 97f65f5

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

userfrosting/config-userfrosting-example.php

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@
4040
'cache_limiter' => false
4141
],
4242
'db' => [
43-
'db_host' => 'localhost',
44-
'db_port' => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
45-
'db_name' => 'userfrosting',
46-
'db_user' => 'admin',
47-
'db_pass' => 'password',
48-
'db_prefix'=> 'uf_'
43+
'db_driver' => 'mysql',
44+
'db_host' => 'localhost',
45+
'db_port' => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
46+
'db_name' => 'userfrosting',
47+
'db_user' => 'admin',
48+
'db_pass' => 'password',
49+
'db_prefix' => 'uf_'
4950
],
5051
'mail' => 'smtp',
5152
'smtp' => [
@@ -90,12 +91,13 @@
9091
'cache_limiter' => false
9192
],
9293
'db' => [
93-
'db_host' => 'localhost',
94-
'db_port' => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
95-
'db_name' => 'userfrosting',
96-
'db_user' => 'admin',
97-
'db_pass' => 'password',
98-
'db_prefix'=> 'uf_'
94+
'db_driver' => 'mysql',
95+
'db_host' => 'localhost',
96+
'db_port' => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
97+
'db_name' => 'userfrosting',
98+
'db_user' => 'admin',
99+
'db_pass' => 'password',
100+
'db_prefix' => 'uf_'
99101
],
100102
'mail' => 'smtp',
101103
'smtp' => [

userfrosting/initialize.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,15 @@
5151
'prefix' => ''
5252
];
5353

54-
// This is for backwards compatibility. Pre-0.3.1.19 configuration files won't have $dbx['db_port'] defined at all.
55-
if (isset($dbx['db_port']))
56-
{
54+
// This is for backwards compatibility. Pre-0.3.1.19 configuration files won't have $dbx['db_port'] or $dbx['db_driver'] defined at all.
55+
if (isset($dbx['db_port'])) {
5756
$connection_array['port'] = $dbx['db_port'];
5857
}
5958

59+
if (isset($dbx['db_driver'])) {
60+
$connection_array['driver'] = $dbx['db_driver'];
61+
}
62+
6063
$capsule->addConnection($connection_array);
6164

6265
// Register as global connection

0 commit comments

Comments
 (0)