diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-03-21 16:30:59 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-03-21 16:30:59 +0000 |
| commit | 892343c7c11e7ba967f69174820a501b3954badb (patch) | |
| tree | ee15678afbd6808178dc6c28e51c4d8a48b0113e | |
| parent | 07d7138df08834acc1ac6ff019859ceca09d4690 (diff) | |
| download | nextcloud-server-892343c7c11e7ba967f69174820a501b3954badb.tar.gz nextcloud-server-892343c7c11e7ba967f69174820a501b3954badb.zip | |
Fix instance import
| -rw-r--r-- | apps/admin_export/settings.php | 2 | ||||
| -rw-r--r-- | lib/migrate.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/admin_export/settings.php b/apps/admin_export/settings.php index cd85bedcd7d..269147a3bc6 100644 --- 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 8b0a2aa3f74..718dc57b9f3 100644 --- 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; } |