From dd25e7a24b3e260bddc20ce252b701b7ef7bb071 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 3 Dec 2013 23:23:36 +0100
Subject: Install.php : corrige bug bd_prefix lors de plusieurs passages par
 step3

https://github.com/marienfressinaud/FreshRSS/issues/273
---
 public/install.php | 8 ++++----
 1 file 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) {
-- 
cgit v1.2.3