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

give quota-limit from SMTP/SQL precedence over (cached) quota from Dovecot

Browse Source
This commit is contained in:
Ralf Becker 2017-02-28 18:39:05 +01:00
parent d3a5a34bfd
commit 5612a98994
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail/Account.php
View File

@ -309,6 +309,11 @@ class Account implements \ArrayAccess
$this->imapServer($this->user) && is_a($this->imapServer, __NAMESPACE__.'\\Imap') &&
($data = $this->imapServer->getUserData($GLOBALS['egw']->accounts->id2name($this->user))))
{
// give quota-limit from SMTP/SQL precedence over (cached) quota from Dovecot
if (isset($this->params['quotaLimit']) && is_a($this->imapServer, __NAMESPACE__.'\\Imap\\Dovecot'))
{
unset($data['quotaLimit']);
}
$this->params = array_merge($this->params, $data);
}
}