From 0925ea6313023d5c56ebff7afe3b2cbcb96afec3 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 19 Nov 2012 13:53:15 +0000 Subject: [PATCH] use new functionality (forceEAProfileLoad) in hooks and uiaccounts --- admin/inc/class.uiaccounts.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php index 225beb830b..e3c9efb165 100755 --- a/admin/inc/class.uiaccounts.inc.php +++ b/admin/inc/class.uiaccounts.inc.php @@ -1209,10 +1209,9 @@ if ($group_repository['mailAllowed'] && $GLOBALS['egw_info']['apps']['emailadmin'] && $GLOBALS['egw_info']['apps']['felamimail']) { - $emailadmin = new emailadmin_bo(); - if (($default_profile_id = $emailadmin->getDefaultProfileID())) + if (($default_profile_id = emailadmin_bo::getDefaultProfileID())) { - $bofelamimail = felamimail_bo::getInstance(true, $default_profile_id); + $bofelamimail = felamimail_bo::forceEAProfileLoad($default_profile_id); $ogServer = $bofelamimail->mailPreferences->getOutgoingServer($default_profile_id); //error_log(__METHOD__."() default_profile_id = $default_profile_id, get_class(ogServer)=".get_class($ogServer)); if (!in_array(get_class($ogServer), array('defaultsmtp', 'emailadmin_smtp')))