summaryrefslogtreecommitdiffstats
path: root/apps/user_migrate
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2012-03-27 21:35:29 +0000
committerTom Needham <needham.thomas@gmail.com>2012-03-27 21:35:29 +0000
commitbd4fd76bfb94a7b4af0f85838ac9e539e730fa5d (patch)
tree5685b8fdcc51ff11e7a21be25bd54fabf6d8afdc /apps/user_migrate
parentef33219e4f83652676c7a668b6126c3c1c0da34d (diff)
downloadnextcloud-server-bd4fd76bfb94a7b4af0f85838ac9e539e730fa5d.tar.gz
nextcloud-server-bd4fd76bfb94a7b4af0f85838ac9e539e730fa5d.zip
Fix bookmarks migration provider
Diffstat (limited to 'apps/user_migrate')
-rw-r--r--apps/user_migrate/admin.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php
index 1c4894c0f22..61b83c2a140 100644
--- a/apps/user_migrate/admin.php
+++ b/apps/user_migrate/admin.php
@@ -54,11 +54,16 @@ if (isset($_POST['user_import'])) {
}
}
}
- die(print_r($notsupported));
- die( 'Some apps failed to import, or were not supported.' );
+ // Any problems?
+ if( isset( $notsupported ) || isset( $failed ) ){
+ if( count( $failed ) > 0 ){
+ die( 'Some apps failed to import. View the log please.' );
+ } else if( count( $notsupported ) > 0 ){
+ die( 'Some apps were not found in this owncloud instance and therefore could not be installed' );
+ }
+ }
}
-
} else {
// fill template
$tmpl = new OC_Template('user_migrate', 'admin');