Fix instance import

diff --git a/apps/admin_export/settings.php b/apps/admin_export/settings.php
index cd85bedcd7d2a1cca58cde7101b0eda00f989b18..269147a3bc642b1f667e50d46fa48935037578ed 100644 (file)
--- 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');  
        }
                

diff --git a/lib/migrate.php b/lib/migrate.php
index 8b0a2aa3f7490ec262dba793a1f291499508fcf0..718dc57b9f37016759569f37b4e74358169d4205 100644 (file)
--- 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;   
                }