Skip to content
This repository has been archived by the owner on May 4, 2021. It is now read-only.

Patch for https://forge.typo3.org/issues/88122. Fixes ambiguous "loca… #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patch for https://forge.typo3.org/issues/88122. Fixes ambiguous "loca… #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Service/EventService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down