From 4eb008461ab33b717377415a50465469548651e6 Mon Sep 17 00:00:00 2001
From: franzz <francois@lutran.fr>
Date: Sun, 7 Aug 2016 22:13:10 +0200
Subject: [PATCH] also fix context in case of restore

---
 current_version/config.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/current_version/config.php b/current_version/config.php
index f7b1eec..f5d66bb 100755
--- a/current_version/config.php
+++ b/current_version/config.php
@@ -162,7 +162,12 @@ function connection()
 		addMessage(getError(array('Impossible de s&eacute;lectionner la base de donn&eacute;es "'.DB_NAME.'"', 'Changez les constantes dans le fichier "'.SETTINGS_FILE.'" ou r&eacute;installer la base de donn&eacute;es'), true));
 		$_GET['page'] = 'install';
 	}
-	
+	setContext($oConnection);
+	return $oConnection;
+}
+
+function setContext(&$oConnection)
+{
 	//php settings
 	date_default_timezone_set(TIMEZONE);
 	ini_set('default_charset', TEXT_ENC);
@@ -185,8 +190,6 @@ function connection()
 	$iMins -= $iHours * 60;
 	$sOffset = sprintf('%+d:%02d', $iHours*$iSign, $iMins);
 	setQuery("SET time_zone='{$sOffset}';");
-	
-	return $oConnection;
 }
 
 function getTables()
@@ -488,6 +491,7 @@ function restoreBackUp($sBackFilePath, &$oConnection)
 		$sFileContents = file_get_contents($sBackFilePath);
 		mysql_close($oConnection);
 		$oConnection = mysql_connect(DB_SERVER, DB_LOGIN, DB_PASS);
+		setContext($oConnection);
 		$asQueries = array_filter(explode(END_OF_QUERY, str_replace(array("\r\n", "\n"), '', $sFileContents)));
 		foreach($asQueries as $sQuery)
 		{