Bladeren bron

Install.php : corrige bug bd_prefix lors de plusieurs passages par step3

https://github.com/marienfressinaud/FreshRSS/issues/273
Alexandre Alapetite 12 jaren geleden
bovenliggende
commit
dd25e7a24b
1 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 4 4
      public/install.php

+ 4 - 4
public/install.php

@@ -218,7 +218,7 @@ function saveStep3 () {
 		writeLine ($f, 'prefix = "' . $_SESSION['bd_prefix'] . '"');
 		writeLine ($f, 'prefix = "' . $_SESSION['bd_prefix'] . '"');
 		fclose ($f);
 		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 ();
 		$res = checkBD ();
 
 
 		if ($res) {
 		if ($res) {
@@ -354,21 +354,21 @@ function checkBD () {
 			      $_SESSION['bd_pass'],
 			      $_SESSION['bd_pass'],
 			      $driver_options);
 			      $driver_options);
 
 
-		$sql = sprintf (SQL_REQ_CAT, $_SESSION['bd_prefix']);
+		$sql = sprintf (SQL_REQ_CAT, $_SESSION['bd_prefix_user']);
 		$res = $c->query ($sql);
 		$res = $c->query ($sql);
 
 
 		if (!$res) {
 		if (!$res) {
 			$error = true;
 			$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);
 		$res = $c->query ($sql);
 
 
 		if (!$res) {
 		if (!$res) {
 			$error = true;
 			$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);
 		$res = $c->query ($sql);
 
 
 		if (!$res) {
 		if (!$res) {