extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle calendar replacements (search for events) only when there are calendar replacements required

Browse Source
This commit is contained in:
Klaus Leithoff 2010-05-26 12:53:26 +00:00
parent d4a7d28b31
commit fa71adc0c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_merge.inc.php
View File

@ -318,9 +318,9 @@ class addressbook_merge // extends bo_merge
{ {
$replacements += $this->contact_replacements($user,'user'); $replacements += $this->contact_replacements($user,'user');
} }
if (strpos($content,'$$calendar/') !== null) if (!(strpos($content,'$$calendar/') === false))
{ {
$replacements += $this->calendar_replacements($id,strpos($content,'$$calendar/-1/') !== null); $replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
} }
$replacements['$$date$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],time()+$this->contacts->tz_offset_s); $replacements['$$date$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],time()+$this->contacts->tz_offset_s);