From 2af28ce33e4afadbb3c79fca070bd20bf8348d75 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 9 Feb 2015 09:17:02 +0000 Subject: [PATCH] * Mail: fixed exception when opening vacation notice or sieve-rules for an account with a changed standard identity or later created account emailadmin_account::read_identity() needs ident_id NOT acc_id as 1. parameter --- mail/inc/class.mail_sieve.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php index 404325f8ed..180f0c0166 100644 --- a/mail/inc/class.mail_sieve.inc.php +++ b/mail/inc/class.mail_sieve.inc.php @@ -69,7 +69,7 @@ class mail_sieve if ($acc_id > 0) { $this->account = emailadmin_account::read($acc_id); - $identity = emailadmin_account::read_identity($acc_id,true); + $identity = emailadmin_account::read_identity($this->account->ident_id,true); $this->currentIdentity = mail_bo::generateIdentityString($identity,false); }