aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-03 23:23:36 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-03 23:23:36 +0100
commitdd25e7a24b3e260bddc20ce252b701b7ef7bb071 (patch)
treef34620065d1e818c26990485b6098e1fd9099438
parente177b288f5125f9a34059ae8111d02c7f6d51c61 (diff)
Install.php : corrige bug bd_prefix lors de plusieurs passages par step3
https://github.com/marienfressinaud/FreshRSS/issues/273
-rw-r--r--public/install.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/public/install.php b/public/install.php
index 6765d8cd1..a8a9c93fb 100644
--- a/public/install.php
+++ b/public/install.php
@@ -218,7 +218,7 @@ function saveStep3 () {
writeLine ($f, 'prefix = "' . $_SESSION['bd_prefix'] . '"');
fclose ($f);
- $_SESSION['bd_prefix'] .= (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_'));
+ $_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] . (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_'));
$res = checkBD ();
if ($res) {
@@ -354,21 +354,21 @@ function checkBD () {
$_SESSION['bd_pass'],
$driver_options);
- $sql = sprintf (SQL_REQ_CAT, $_SESSION['bd_prefix']);
+ $sql = sprintf (SQL_REQ_CAT, $_SESSION['bd_prefix_user']);
$res = $c->query ($sql);
if (!$res) {
$error = true;
}
- $sql = sprintf (SQL_REQ_FEED, $_SESSION['bd_prefix'], $_SESSION['bd_prefix']);
+ $sql = sprintf (SQL_REQ_FEED, $_SESSION['bd_prefix_user'], $_SESSION['bd_prefix_user']);
$res = $c->query ($sql);
if (!$res) {
$error = true;
}
- $sql = sprintf (SQL_REQ_ENTRY, $_SESSION['bd_prefix'], $_SESSION['bd_prefix']);
+ $sql = sprintf (SQL_REQ_ENTRY, $_SESSION['bd_prefix_user'], $_SESSION['bd_prefix_user']);
$res = $c->query ($sql);
if (!$res) {