diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-03-01 22:58:44 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-03-01 22:59:35 +0100 |
| commit | d1dcd7893cb878263b8179bab16d101036c57a88 (patch) | |
| tree | c2759b3d1a862fed99144d79907d9b9628671d90 /apps/calendar | |
| parent | 8c7b13db7011c8be986e9e525ca392bb13375432 (diff) | |
| download | nextcloud-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/calendar')
| -rw-r--r-- | apps/calendar/appinfo/app.php | 3 | ||||
| -rw-r--r-- | apps/calendar/lib/search.php | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php index 9c95768895f..174bc009e45 100644 --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -6,6 +6,7 @@ if(version_compare(PHP_VERSION, '5.3.0', '>=')){ OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php'; OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php'; OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php'; + OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php'; OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser'); OC_Util::addScript('calendar','loader'); OC_App::register( array( @@ -19,5 +20,5 @@ if(version_compare(PHP_VERSION, '5.3.0', '>=')){ 'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ), 'name' => $l->t('Calendar'))); OC_App::registerPersonal('calendar', 'settings'); - require_once('apps/calendar/lib/search.php'); + OC_Search::registerProvider('OC_Search_Provider_Calendar'); } diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php index 0016751a66a..8405866392d 100644 --- a/apps/calendar/lib/search.php +++ b/apps/calendar/lib/search.php @@ -1,6 +1,6 @@ <?php -class OC_Search_Provider_Calendar extends OC_Search_Provider{ - function search($query){ +class OC_Search_Provider_Calendar implements OC_Search_Provider{ + static function search($query){ $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1); if(count($calendars)==0 || !OC_App::isEnabled('calendar')){ //return false; @@ -44,4 +44,3 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{ return $results; } } -new OC_Search_Provider_Calendar(); |