diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-21 20:19:31 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-21 20:19:31 +0000 |
| commit | a5938e4e3766bb7502a3493661ed3bac662f5182 (patch) | |
| tree | 02fcbe206788e471f122158730004554afec83c5 /apps/calendar | |
| parent | 84b9ac2678e6a0b014b730896a12d1531789d8da (diff) | |
| parent | 37d12144c2debd27271378d2adc5c2b65a25e1f7 (diff) | |
| download | nextcloud-server-a5938e4e3766bb7502a3493661ed3bac662f5182.tar.gz nextcloud-server-a5938e4e3766bb7502a3493661ed3bac662f5182.zip | |
Merge branch 'master' into multi_app_dir
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/lib/search.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php index 6526b4223ac..560330f65e9 100644 --- a/apps/calendar/lib/search.php +++ b/apps/calendar/lib/search.php @@ -17,6 +17,9 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{ foreach($calendars as $calendar){ $objects = OC_Calendar_Object::all($calendar['id']); foreach($objects as $object){ + if($object['objecttype']!='VEVENT') { + continue; + } if(substr_count(strtolower($object['summary']), strtolower($query)) > 0){ $calendardata = OC_VObject::parse($object['calendardata']); $vevent = $calendardata->VEVENT; @@ -37,7 +40,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{ $info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i') . ' - ' . $end_dt->format('d.m.y H:i'); } $link = OCP\Util::linkTo('calendar', 'index.php').'?showevent='.urlencode($object['id']); - $results[]=new OC_Search_Result($object['summary'],$info, $link,$l->t('Cal.'));//$name,$text,$link,$type + $results[]=new OC_Search_Result($object['summary'],$info, $link,(string)$l->t('Cal.'));//$name,$text,$link,$type } } } |