diff options
| author | Georg Ehrke <ownclouddev@georgswebsite.de> | 2011-12-26 19:59:15 +0100 |
|---|---|---|
| committer | Georg Ehrke <ownclouddev@georgswebsite.de> | 2011-12-26 19:59:15 +0100 |
| commit | ffa835c56f4575b3e6e40a1d2247f7b374fdc892 (patch) | |
| tree | 3c07488f59680e25c7f2c79c7b9a573b223d0b6d /apps/calendar/lib | |
| parent | d582f7576c1f70aae4cd866032d2630e6f0e7a9b (diff) | |
| download | nextcloud-server-ffa835c56f4575b3e6e40a1d2247f7b374fdc892.tar.gz nextcloud-server-ffa835c56f4575b3e6e40a1d2247f7b374fdc892.zip | |
fix the default setting for yearly repeating events
Diffstat (limited to 'apps/calendar/lib')
| -rw-r--r-- | apps/calendar/lib/object.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php index c5ae760d00f..b53feb0bf0e 100644 --- a/apps/calendar/lib/object.php +++ b/apps/calendar/lib/object.php @@ -438,6 +438,7 @@ class OC_Calendar_Object{ public static function getYearOptions($l10n){ return array( + 'bydate' => $l10n->t('by events date'), 'byyearday' => $l10n->t('by yearday(s)'), 'byweekno' => $l10n->t('by weeknumber(s)'), 'bydaymonth' => $l10n->t('by day and month') @@ -700,12 +701,13 @@ class OC_Calendar_Object{ break; case 'yearly': $rrule .= 'FREQ=YEARLY'; - if($request['advanced_year_select'] == 'byyearday'){ - $byyearday = ''; - foreach($request['byyearday'] as $yearday){ - if($byyearday == ''){ - $byyearday = $yearday; - }else{ + if($request['advanced_year_select'] == 'bydate'){ + + }elseif($request['advanced_year_select'] == 'byyearday'){ + list($_day, $_month, $_year) = explode('-', $from); + $byyearday = date('z', mktime(0,0,0, $_month, $_day, $_year)) + 1; + if(array_key_exists('byyearday', $request)){ + foreach($request['byyearday'] as $yearday){ $byyearday .= ',' . $yearday; } } |