diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-03-13 16:21:17 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-03-13 16:21:17 +0000 |
| commit | 4d5646a59f813e09455c78d840d0f62397ec60ad (patch) | |
| tree | f22c4bd65a4f6bca4b5669c2ca93ac599c1f90b3 /apps/bookmarks | |
| parent | d108bdc7c7940d23355c9a16f3f355387bbb66ef (diff) | |
| download | nextcloud-server-4d5646a59f813e09455c78d840d0f62397ec60ad.tar.gz nextcloud-server-4d5646a59f813e09455c78d840d0f62397ec60ad.zip | |
Find migrate.php even for disabled apps. Improve ui for user and admin migrations
Diffstat (limited to 'apps/bookmarks')
| -rw-r--r-- | apps/bookmarks/appinfo/app.php | 4 | ||||
| -rw-r--r-- | apps/bookmarks/lib/migrate.php | 1 |
2 files changed, 1 insertions, 4 deletions
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 |