holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support customfields at the beginning of content

Browse Source
This commit is contained in:
nathangray 2016-05-18 15:41:20 -06:00
parent 2ffcdf5dc9
commit 5be77f5ef2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_merge.inc.php
View File

@ -314,7 +314,7 @@ class calendar_merge extends Api\Storage\Merge
$replacements['$$'.($prefix?$prefix.'/':'').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'],'account_primary_group')); $replacements['$$'.($prefix?$prefix.'/':'').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'],'account_primary_group'));
} }
if($content && strpos($content, '$$#') !== 0) if($content && strpos($content, '$$#') !== FALSE)
{ {
$this->cf_link_to_expand($event, $content, $replacements); $this->cf_link_to_expand($event, $content, $replacements);
} }

2
infolog/inc/class.infolog_merge.inc.php
View File

@ -102,7 +102,7 @@ class infolog_merge extends Api\Storage\Merge
if(!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name; if(!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name;
} }
if($content && strpos($content, '$$#') !== 0) if($content && strpos($content, '$$#') !== FALSE)
{ {
$this->cf_link_to_expand($record->get_record_array(), $content, $info); $this->cf_link_to_expand($record->get_record_array(), $content, $info);
} }