holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catch exeption on CreateObject of bopreferences, if no felamimail is available

Browse Source
This commit is contained in:
Klaus Leithoff 2011-10-17 08:42:48 +00:00
parent 38032d34fd
commit 9cd7b40add
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.send.inc.php
View File

@ -44,7 +44,14 @@ class send extends egw_mailer
// if dontUseUserDefinedProfiles is set to yes/true/1 dont restore the session AND dont retrieve UserdefinedAccount settings // if dontUseUserDefinedProfiles is set to yes/true/1 dont restore the session AND dont retrieve UserdefinedAccount settings
$notification_config = config::read('notifications'); $notification_config = config::read('notifications');
if ($notification_config['dontUseUserDefinedProfiles']) $restoreSession = $getUserDefinedProfiles = false; if ($notification_config['dontUseUserDefinedProfiles']) $restoreSession = $getUserDefinedProfiles = false;
try
{
$bopreferences =& CreateObject('felamimail.bopreferences',$restoreSession); $bopreferences =& CreateObject('felamimail.bopreferences',$restoreSession);
}
catch (egw_exception_assertion_failed $e)
{
$bopreferences = false;
}
if ($bopreferences) { if ($bopreferences) {
if ($this->debug) error_log(__METHOD__." using felamimail preferences for mailing."); if ($this->debug) error_log(__METHOD__." using felamimail preferences for mailing.");
// if dontUseUserDefinedProfiles is set to yes/true/1 dont retrieve UserdefinedAccount settings // if dontUseUserDefinedProfiles is set to yes/true/1 dont retrieve UserdefinedAccount settings