From 5be77f5ef2352013cf1c1a29110d0405ad718332 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 18 May 2016 15:41:20 -0600 Subject: [PATCH] Support customfields at the beginning of content --- calendar/inc/class.calendar_merge.inc.php | 2 +- infolog/inc/class.infolog_merge.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php index bbe9a27769..41c5349845 100644 --- a/calendar/inc/class.calendar_merge.inc.php +++ b/calendar/inc/class.calendar_merge.inc.php @@ -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')); } - if($content && strpos($content, '$$#') !== 0) + if($content && strpos($content, '$$#') !== FALSE) { $this->cf_link_to_expand($event, $content, $replacements); } diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php index 7bab6cd245..1c668e75f4 100644 --- a/infolog/inc/class.infolog_merge.inc.php +++ b/infolog/inc/class.infolog_merge.inc.php @@ -102,7 +102,7 @@ class infolog_merge extends Api\Storage\Merge 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); }