Skip to content
Snippets Groups Projects
Commit 1f860c2a authored by Greeshma's avatar Greeshma
Browse files

calendar_action_feed.php

parent b911c3f3
No related branches found
No related tags found
No related merge requests found
......@@ -125,7 +125,9 @@ class Calendar_Feed_Action extends Vtiger_BasicAjax_Action {
$queryGenerator->setFields(array_merge(array_merge($nameFields, array('id')), $fieldsList));
$query = $queryGenerator->getQuery();
$query.= " AND (($fieldsList[0] >= ? AND $fieldsList[1] < ?) OR ($fieldsList[1] >= ?)) ";
$startDateColumn = Vtiger_Util_Helper::validateStringForSql($fieldsList[0]);
$endDateColumn = Vtiger_Util_Helper::validateStringForSql($fieldsList[1]);
$query.= " AND (($startDateColumn >= ? AND $endDateColumn < ?) OR ($endDateColumn >= ?)) ";
$params = array($start,$end,$start);
$query.= " AND vtiger_crmentity.smownerid IN (".generateQuestionMarks($userAndGroupIds).")";
$params = array_merge($params, $userAndGroupIds);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment