From 66d1cf02b97a3139800939ed9aff3ac12cadb2d0 Mon Sep 17 00:00:00 2001 From: djmaze Date: Fri, 26 Nov 2021 16:37:58 +0100 Subject: [PATCH] Bugfix: instanceof check was incorrect --- .../v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php index 582b61e93..87ac1c76e 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php @@ -131,11 +131,11 @@ trait Accounts $aResult['IncLogin'] = $oAccount->IncLogin(); $aResult['OutLogin'] = $oAccount->OutLogin(); $aResult['AccountHash'] = $oAccount->Hash(); - $aResult['MainEmail'] = ($oAccount instanceof \RainLoop\Model\AdditionalAccount) + $aResult['MainEmail'] = ($oAccount instanceof AdditionalAccount) ? $oAccount->ParentEmail() : ''; $aResult['ContactsIsAllowed'] = $this->AddressBookProvider($oAccount)->IsActive(); $oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount); - if ($oSettingsLocal instanceof Settings) { + if ($oSettingsLocal instanceof \RainLoop\Settings) { $aResult['SentFolder'] = (string) $oSettingsLocal->GetConf('SentFolder', ''); $aResult['DraftFolder'] = (string) $oSettingsLocal->GetConf('DraftFolder', ''); $aResult['SpamFolder'] = (string) $oSettingsLocal->GetConf('SpamFolder', '');