summaryrefslogtreecommitdiffstats
path: root/apps/calendar
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-05-11 20:32:37 +0200
committerRobin Appelman <icewind@owncloud.com>2012-05-11 20:33:56 +0200
commit736739bbbda2e9930b7bdcf79f43a28fad4d1d5d (patch)
treeb77bc51d0759baeec9e5b3cc2857548a12715d13 /apps/calendar
parentd2bd78c41a58320e0f1f6ff6d602371325390747 (diff)
downloadnextcloud-server-736739bbbda2e9930b7bdcf79f43a28fad4d1d5d.tar.gz
nextcloud-server-736739bbbda2e9930b7bdcf79f43a28fad4d1d5d.zip
load remote and public paths from info.xml during upgrade instead of setting them every time
Diffstat (limited to 'apps/calendar')
-rwxr-xr-xapps/calendar/appinfo/app.php2
-rw-r--r--apps/calendar/appinfo/info.xml8
-rw-r--r--apps/calendar/appinfo/version2
3 files changed, 9 insertions, 3 deletions
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 0c91bf8f135..b02fc602c6b 100755
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -23,5 +23,3 @@ OCP\App::addNavigationEntry( array(
'name' => $l->t('Calendar')));
OCP\App::registerPersonal('calendar', 'settings');
OC_Search::registerProvider('OC_Search_Provider_Calendar');
-OCP\CONFIG::setAppValue('core', 'remote_caldav', '/apps/calendar/appinfo/remote.php');
-OCP\CONFIG::setAppValue('core', 'public_calendar', '/apps/calendar/share.php'); \ No newline at end of file
diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml
index 101840aa1fa..f45f306e7d0 100644
--- a/apps/calendar/appinfo/info.xml
+++ b/apps/calendar/appinfo/info.xml
@@ -7,4 +7,12 @@
<require>2</require>
<description>Calendar with CalDAV support</description>
<default_enable/>
+ <remote>
+ <calendar>appinfo/remote.php</calendar>
+ <caldav>appinfo/remote.php</caldav>
+ </remote>
+ <public>
+ <calendar>share.php</calendar>
+ <caldav>share.php</caldav>
+ </public>
</info>
diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version
index 1d71ef97443..e6adf3fc7bb 100644
--- a/apps/calendar/appinfo/version
+++ b/apps/calendar/appinfo/version
@@ -1 +1 @@
-0.3 \ No newline at end of file
+0.4 \ No newline at end of file