mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
fix for bug #2086 Trunk/1.6 Users cant define their own identities...
This commit is contained in:
parent
a63bba2e4d
commit
bdcbce7f68
@ -149,7 +149,7 @@
|
||||
if(!is_a($profileData, 'ea_preferences') || !is_a($profileData->ic_server[0], 'defaultimap')) {
|
||||
return false;
|
||||
}
|
||||
if($profileData->userDefinedAccounts) {
|
||||
if($profileData->userDefinedAccounts || $profileData->userDefinedIdentities) {
|
||||
// get user defined accounts
|
||||
$allAccountData = $this->getAllAccountData($profileData);
|
||||
if ($allAccountData) {
|
||||
@ -169,7 +169,6 @@
|
||||
$this->profileData = $this->sessionData['profileData'];
|
||||
}
|
||||
if(!is_a($this->profileData,'ea_preferences')) {
|
||||
|
||||
$imapServerTypes = $this->boemailadmin->getIMAPServerTypes();
|
||||
$profileData = $this->boemailadmin->getUserProfile('felamimail');
|
||||
|
||||
@ -196,6 +195,8 @@
|
||||
$rememberID = $accountData['identity']->id;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($profileData->userDefinedIdentities && $GLOBALS['egw_info']['user']['apps']['felamimail']) {
|
||||
$allUserIdentities = $this->getUserDefinedIdentities();
|
||||
if (is_array($allUserIdentities)) {
|
||||
$i=count($allUserIdentities);
|
||||
|
Loading…
Reference in New Issue
Block a user