holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed SQL error in install from backup, as suggested by Hans-Jürgen

Browse Source
This commit is contained in:
Ralf Becker 2010-09-18 17:10:35 +00:00
parent 67aff3d370
commit 22392e54b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/index.php
View File

@ -300,7 +300,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
// use uploaded backup, instead installing from scratch // use uploaded backup, instead installing from scratch
if ($_POST['upload']) if ($_POST['upload'])
{ {
$db_backup =& CreateObject('phpgwapi.db_backup'); $db_backup = new db_backup();
if (is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] && if (is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] &&
is_uploaded_file($_FILES['uploaded']['tmp_name'])) is_uploaded_file($_FILES['uploaded']['tmp_name']))
{ {
@ -313,7 +313,7 @@ switch($GLOBALS['egw_info']['setup']['stage']['db'])
if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'],true))) if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'],true)))
{ {
echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096); echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
$db_backup->restore($f,$_POST['convert_charset'],$_FILES['uploaded']['tmp_name']); $db_backup->restore($f,$_POST['convert_charset'],$_FILES['uploaded']['tmp_name'],false);
fclose($f); fclose($f);
echo '<p align="center">'.lang('restore finished')."</p>\n"; echo '<p align="center">'.lang('restore finished')."</p>\n";
unlink($_FILES['uploaded']['tmp_name']); unlink($_FILES['uploaded']['tmp_name']);