Fix instance import

13 years ago · 892343c7c1
parent 07d7138df0
commit 892343c7c1
2 changed files with 2 additions and 2 deletions
--- a/apps/admin_export/settings.php
+++ b/apps/admin_export/settings.php
@ -44,7 +44,7 @@ if (isset($_POST['admin_export'])) {
 } else if( isset($_POST['admin_import']) ){
 	$from = $_FILES['owncloud_import']['tmp_name'];

-	if( !OC_Migrate::import( $from ) ){
+	if( !OC_Migrate::import( $from, 'instance' ) ){
 		die('failed');	
 	}
 		
--- a/lib/migrate.php
+++ b/lib/migrate.php
@ -208,7 +208,7 @@ class OC_Migrate{
 			return false;	
 		}
 		$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 );
 			return false;	
 		}