From 399abd4060b3b9e3b877a46e6eeab083376fdb14 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 26 May 2010 12:47:50 +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 9b59af4c0d..dd30daf847 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -45,9 +45,9 @@ class addressbook_merge extends bo_merge
 		{
 			return false;
 		}
-		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));
 		}
 		return $replacements;
 	}