From fa71adc0c3694804d7336910ffd5fb17f683836e Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 26 May 2010 12:53:26 +0000 Subject: [PATCH] handle calendar replacements (search for events) only when there are calendar replacements required --- addressbook/inc/class.addressbook_merge.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index 920b491af5..1b8132723a 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -318,9 +318,9 @@ class addressbook_merge // extends bo_merge { $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);