aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-06-21 20:51:23 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-06-21 20:51:23 +0200
commitb17bf59cedce3f6326af26c9d1522d57b1d15ada (patch)
treece2ac2c54757722a4407e8a7578616c62095205b /apps
parentb17e6826099f2ba58d1abd246cf3c103520efea4 (diff)
downloadnextcloud-server-b17bf59cedce3f6326af26c9d1522d57b1d15ada.tar.gz
nextcloud-server-b17bf59cedce3f6326af26c9d1522d57b1d15ada.zip
Only search for VEVENTs.
Diffstat (limited to 'apps')
-rw-r--r--apps/calendar/lib/search.php5
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
}
}
}