mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix instance import

This commit is contained in:
Tom Needham 2012-03-21 16:30:59 +00:00
parent 07d7138df0
commit 892343c7c1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/admin_export/settings.php
View File

@ -44,7 +44,7 @@ if (isset($_POST['admin_export'])) {
} else if( isset($_POST['admin_import']) ){ } else if( isset($_POST['admin_import']) ){
$from = $_FILES['owncloud_import']['tmp_name']; $from = $_FILES['owncloud_import']['tmp_name'];
if( !OC_Migrate::import( $from ) ){ if( !OC_Migrate::import( $from, 'instance' ) ){
die('failed'); die('failed');
} }

2
lib/migrate.php
View File

@ -208,7 +208,7 @@ class OC_Migrate{
return false; return false;
} }
$json = json_decode( file_get_contents( $extractpath . 'export_info.json' ) ); $json = json_decode( file_get_contents( $extractpath . 'export_info.json' ) );
if( !$json->exporttype != $type ){ if( $json->exporttype != $type ){
OC_Log::write( 'migration', 'Invalid import file', OC_Log::ERROR ); OC_Log::write( 'migration', 'Invalid import file', OC_Log::ERROR );
return false; return false;
} }