From 12b3c133267c9eaada33194414ae190f5a781981 Mon Sep 17 00:00:00 2001 From: Daniel Bagel Date: Mon, 8 Jul 2019 11:26:31 +0200 Subject: [PATCH] Patch for https://forge.typo3.org/issues/88122. Fixes ambiguous "location_id" in SQL where clause when filtering events by location in translations. --- Classes/Service/EventService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Service/EventService.php b/Classes/Service/EventService.php index 9b37089..1903da3 100644 --- a/Classes/Service/EventService.php +++ b/Classes/Service/EventService.php @@ -1344,7 +1344,7 @@ function search($pidList = '', $start_date, $end_date, $searchword, $locationIds $timeSearchString = ' AND tx_cal_event.pid IN (' . $pidList . ') ' . $this->cObj->enableFields ('tx_cal_event') . ' AND (((tx_cal_event.start_date>=' . $formattedStarttime . ' AND tx_cal_event.start_date<=' . $formattedEndtime . ') OR (tx_cal_event.end_date<=' . $formattedEndtime . ' AND tx_cal_event.end_date>=' . $formattedStarttime . ') OR (tx_cal_event.end_date>=' . $formattedEndtime . ' AND tx_cal_event.start_date<=' . $formattedStarttime . ') OR (tx_cal_event.start_date<=' . $formattedEndtime . ' AND (tx_cal_event.freq IN ("day","week","month","year") AND (tx_cal_event.until>=' . $formattedStarttime . ' OR tx_cal_event.until=0)))) OR (tx_cal_event.rdate AND tx_cal_event.rdate_type IN ("date_time","date","period"))) '; if ($locationIds != '' && $locationIds != '0') { - $locationSearchString = ' AND location_id in (' . $locationIds . ')'; + $locationSearchString = ' AND tx_cal_event.location_id in (' . $locationIds . ')'; } if ($organizerIds != '' && $organizerIds != '0') {