From 4d5646a59f813e09455c78d840d0f62397ec60ad Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Tue, 13 Mar 2012 16:21:17 +0000 Subject: Find migrate.php even for disabled apps. Improve ui for user and admin migrations --- apps/bookmarks/appinfo/app.php | 4 ---- apps/bookmarks/lib/migrate.php | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'apps/bookmarks') diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php index 13d76e08179..b9c308ca053 100644 --- a/apps/bookmarks/appinfo/app.php +++ b/apps/bookmarks/appinfo/app.php @@ -18,8 +18,4 @@ OC_App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'hr OC_App::registerPersonal('bookmarks', 'settings'); OC_Util::addScript('bookmarks','bookmarksearch'); -// Include the migration provider - -require_once('apps/bookmarks/lib/migrate.php'); - OC_Search::registerProvider('OC_Search_Provider_Bookmarks'); diff --git a/apps/bookmarks/lib/migrate.php b/apps/bookmarks/lib/migrate.php index 451699ec15f..8387f706038 100644 --- a/apps/bookmarks/lib/migrate.php +++ b/apps/bookmarks/lib/migrate.php @@ -54,4 +54,5 @@ class OC_Migrate_Provider_Bookmarks extends OC_Migrate_Provider{ } +// Load the provider new OC_Migrate_Provider_Bookmarks( 'bookmarks' ); \ No newline at end of file -- cgit v1.2.3