franzz/qcmmaker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

also fix context in case of restore

Browse Source
This commit is contained in:
Franzz
2016-08-07 22:13:10 +02:00
parent 3b444b81bd
commit 4eb008461a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
current_version/config.php
View File

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