diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2011-12-21 22:16:46 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2011-12-21 22:16:46 +0100 |
| commit | 469e983a0222ce5cce282e26af9af47ce7100bd4 (patch) | |
| tree | 59f48a3ade7175a2ceef37e0637fa766a43e45ea /apps/calendar/appinfo/app.php | |
| parent | f6ed7a19be539548f1621ee469de98079d46cfce (diff) | |
| parent | e1b9b65e4159bdd6e0ed81c8cd6b588f03b3a018 (diff) | |
| download | nextcloud-server-469e983a0222ce5cce282e26af9af47ce7100bd4.tar.gz nextcloud-server-469e983a0222ce5cce282e26af9af47ce7100bd4.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/appinfo/app.php')
| -rw-r--r-- | apps/calendar/appinfo/app.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php index 5dc41a77cab..267a74bf29a 100644 --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -1,27 +1,23 @@ <?php if(version_compare(PHP_VERSION, '5.3.0', '>')){ $l=new OC_L10N('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'; OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php'; OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php'; OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'deleteUser'); - OC_Util::addScript('calendar','loader'); - OC_App::register( array( 'order' => 10, 'id' => 'calendar', 'name' => 'Calendar' )); - OC_App::addNavigationEntry( array( 'id' => 'calendar_index', 'order' => 10, 'href' => OC_Helper::linkTo( 'calendar', 'index.php' ), 'icon' => OC_Helper::imagePath( 'calendar', 'icon.png' ), 'name' => $l->t('Calendar'))); - OC_App::registerPersonal('calendar', 'settings'); - require_once('apps/calendar/lib/search.php'); -}
\ No newline at end of file +} |