From 0771c4ff08c066a3f9e6d26724b7495550102af3 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 22 Apr 2014 14:15:58 +0000
Subject: [PATCH] fix double call on icServer->getACL

---
 mail/inc/class.mail_acl.inc.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/mail/inc/class.mail_acl.inc.php b/mail/inc/class.mail_acl.inc.php
index 5d6a03fe93..7fcac329e7 100644
--- a/mail/inc/class.mail_acl.inc.php
+++ b/mail/inc/class.mail_acl.inc.php
@@ -415,16 +415,13 @@ class mail_acl
 	 */
 	function getACL ($mailbox)
 	{
-		if(($acl =$this->mail_bo->icServer->getACL($mailbox)))
+		try
 		{
-			try
-			{
-				$acl = $this->mail_bo->icServer->getACL($mailbox);
-				return $acl;
-			} catch (Exception $e) {
-				error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage());
-				return false;
-			}
+			$acl = $this->mail_bo->icServer->getACL($mailbox);
+			return $acl;
+		} catch (Exception $e) {
+			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage());
+			return false;
 		}
 	}
 }