diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-06-06 15:33:54 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-06-06 15:33:54 +0200 |
| commit | cd83002f430d573fc3757de3f4204d911bcb7183 (patch) | |
| tree | 7112e924ff95f338801e1a806ab2b29fa7c016ed /app/install.php | |
| parent | c54372bd3f288030bb3e1047815fe0d6611d7875 (diff) | |
| parent | 92db9202980ce63ad6f437416efd50c07792e7e8 (diff) | |
Merge remote-tracking branch 'origin/PDOOptions' into dev
Diffstat (limited to 'app/install.php')
| -rw-r--r-- | app/install.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/install.php b/app/install.php index 3cdd59d11..313081c14 100644 --- a/app/install.php +++ b/app/install.php @@ -165,7 +165,7 @@ function saveStep3() { $_SESSION['bd_user'] = $_POST['user']; $_SESSION['bd_password'] = $_POST['pass']; $_SESSION['bd_prefix'] = substr($_POST['prefix'], 0, 16); - $_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] .(empty($_SESSION['default_user']) ? '' :($_SESSION['default_user'] . '_')); + $_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] . (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_')); } //TODO: load `config.default.php` as default @@ -183,6 +183,7 @@ function saveStep3() { 'password' => $_SESSION['bd_password'], 'base' => $_SESSION['bd_base'], 'prefix' => $_SESSION['bd_prefix'], + 'pdo_options' => array(), ), ); |