Skip to content
Snippets Groups Projects
Commit fe9aebde authored by Prasad's avatar Prasad
Browse files

Merge branch '132' into 'master'

Fixes #132 - Calendar Change Owner Action

See merge request !112
parents aeefb5df 2299eb61
No related branches found
No related tags found
No related merge requests found
......@@ -485,9 +485,15 @@ function getColumnFields($module)
if($module == 'Calendar') {
$cachedEventsFields = VTCacheUtils::lookupFieldInfo_Module('Events');
if ($cachedEventsFields) {
if(empty($cachedModuleFields)) $cachedModuleFields = $cachedEventsFields;
else $cachedModuleFields = array_merge($cachedModuleFields, $cachedEventsFields);
if (!$cachedEventsFields) {
getColumnFields('Events');
$cachedEventsFields = VTCacheUtils::lookupFieldInfo_Module('Events');
}
if (!$cachedModuleFields) {
$cachedModuleFields = $cachedEventsFields;
} else {
$cachedModuleFields = array_merge($cachedModuleFields, $cachedEventsFields);
}
}
......
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