Skip to content
Snippets Groups Projects
Commit 4d4acabc authored by Uma's avatar Uma
Browse files

Merge branch 'Calendar_view_dates_mismatch' into 'master'

Fixes #1433 Calendar view display mis-matches the dates from records

See merge request !703
parents f574f5a1 a9788ce8
No related branches found
No related tags found
No related merge requests found
......@@ -208,10 +208,11 @@ class Calendar_Feed_Action extends Vtiger_BasicAjax_Action {
$item['sourceModule'] = $moduleModel->getName();
$item['fieldName'] = $fieldName;
$item['conditions'] = '';
if(!empty($conditions)) {
$item['conditions'] = Zend_Json::encode(Zend_Json::encode($conditions));
}
$result[] = $item;
$item['end'] = date('Y-m-d', strtotime(($item['end'] ?: $item['start']).' +1day'));
if(!empty($conditions)) {
$item['conditions'] = Zend_Json::encode(Zend_Json::encode($conditions));
}
$result[] = $item;
}
}
......
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