diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-11-06 14:06:02 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-11-06 14:06:02 +0100 |
| commit | 6a7b5fea3ec301214527f4d8c888cca11d9125e5 (patch) | |
| tree | 00d7d71d6015e78b036746e65d62eb5fc8755b0f /app/install.php | |
| parent | 60941b9a40731be6f06d9422744cbba27982b6f3 (diff) | |
| parent | 1a4fdfb1be7b638f5bfd1011e0f81f5814591474 (diff) | |
Merge branch 'FreshRSS/dev' into git-update
Diffstat (limited to 'app/install.php')
| -rw-r--r-- | app/install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/install.php b/app/install.php index fcc901713..5c8a6e0e8 100644 --- a/app/install.php +++ b/app/install.php @@ -230,7 +230,7 @@ function saveStep3() { $_SESSION['bd_error'] = ''; header('Location: index.php?step=4'); } else { - $_SESSION['bd_error'] = empty($config_array['db']['bd_error']) ? 'Unknown error!' : $config_array['db']['bd_error']; + $_SESSION['bd_error'] = empty($config_array['db']['error']) ? 'Unknown error!' : $config_array['db']['error']; } } invalidateHttpCache(); @@ -375,7 +375,7 @@ function checkDbUser(&$dbOptions) { } } catch (PDOException $e) { $ok = false; - $dbOptions['bd_error'] = $e->getMessage(); + $dbOptions['error'] = $e->getMessage(); } return $ok; } |