summaryrefslogtreecommitdiffstats
path: root/apps/media
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-03-01 22:58:44 +0100
committerBart Visscher <bartv@thisnet.nl>2012-03-01 22:59:35 +0100
commitd1dcd7893cb878263b8179bab16d101036c57a88 (patch)
treec2759b3d1a862fed99144d79907d9b9628671d90 /apps/media
parent8c7b13db7011c8be986e9e525ca392bb13375432 (diff)
downloadnextcloud-server-d1dcd7893cb878263b8179bab16d101036c57a88.tar.gz
nextcloud-server-d1dcd7893cb878263b8179bab16d101036c57a88.zip
Search: Change provider registration to class name, for lazy loading of search providers
Diffstat (limited to 'apps/media')
-rw-r--r--apps/media/appinfo/app.php3
-rw-r--r--apps/media/lib_media.php6
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 475a33500f4..651067fbbe1 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -30,4 +30,5 @@ OC_APP::registerPersonal('media','settings');
OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
OC_App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo('media', 'index.php'), 'icon' => OC_Helper::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music')));
-?>
+
+OC_Search::registerProvider('OC_MediaSearchProvider');
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index a2109c151aa..9de291e8da2 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -82,8 +82,8 @@ class OC_MEDIA{
}
}
-class OC_MediaSearchProvider extends OC_Search_Provider{
- function search($query){
+class OC_MediaSearchProvider implements OC_Search_Provider{
+ static function search($query){
require_once('lib_collection.php');
$artists=OC_MEDIA_COLLECTION::getArtists($query);
$albums=OC_MEDIA_COLLECTION::getAlbums(0,$query);
@@ -107,5 +107,3 @@ class OC_MediaSearchProvider extends OC_Search_Provider{
}
}
-new OC_MediaSearchProvider();
-?>