diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:28:11 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:28:11 +0200 |
| commit | 77cefdedb86de65e69f470c8b6a1b03bb001966e (patch) | |
| tree | 547b3a111c4d07992b7c528f2db4962ee36f91f9 /apps/calendar/appinfo/app.php | |
| parent | 77a9e343aae4fc19a1e6fbf71b73e171640ac02a (diff) | |
| parent | 12818093007d5bdce5519b5015e2a0748c98e24d (diff) | |
| download | nextcloud-server-77cefdedb86de65e69f470c8b6a1b03bb001966e.tar.gz nextcloud-server-77cefdedb86de65e69f470c8b6a1b03bb001966e.zip | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'apps/calendar/appinfo/app.php')
| -rw-r--r-- | apps/calendar/appinfo/app.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php index f297c4d16d4..ea743674fe8 100644 --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -1,5 +1,5 @@ <?php -$l=new OC_L10N('calendar'); +$l=OC_L10N::get('calendar'); OC::$CLASSPATH['OC_Calendar_App'] = 'apps/calendar/lib/app.php'; OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php'; OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php'; @@ -7,7 +7,6 @@ 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_Hook::connect('OC_DAV', 'initialize', 'OC_Calendar_Hooks', 'initializeCalDAV'); OC_Util::addScript('calendar','loader'); OC_App::register( array( 'order' => 10, @@ -20,4 +19,4 @@ OC_App::addNavigationEntry( array( 'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ), 'name' => $l->t('Calendar'))); OC_App::registerPersonal('calendar', 'settings'); -OC_Search::registerProvider('OC_Search_Provider_Calendar');
\ No newline at end of file +OC_Search::registerProvider('OC_Search_Provider_Calendar'); |