mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
* PostgreSQL: fixed not working new installation
due to access to egw_mailaccounts table prior to creating it: gets now checked, to not abort transaction
This commit is contained in:
parent
eb6fd7cf3d
commit
2a5971258b
@ -128,7 +128,9 @@ class accounts_sql
|
||||
$this->contacts_table.'.tel_work AS account_phone,';
|
||||
$join = 'LEFT JOIN '.$this->contacts_table.' ON '.$this->table.'.account_id='.$this->contacts_table.'.account_id';
|
||||
}
|
||||
else
|
||||
// during setup emailadmin might not yet be installed and running below query
|
||||
// will abort transaction in PostgreSQL
|
||||
elseif (!isset($GLOBALS['egw_setup']) || in_array(emailadmin_smtp_sql::TABLE, $this->db->table_names(true)))
|
||||
{
|
||||
$extra_cols = emailadmin_smtp_sql::TABLE.'.mail_value AS account_email,';
|
||||
$join = 'LEFT JOIN '.emailadmin_smtp_sql::TABLE.' ON '.$this->table.'.account_id=-'.emailadmin_smtp_sql::TABLE.'.account_id AND mail_type='.emailadmin_smtp_sql::TYPE_ALIAS;
|
||||
|
Loading…
Reference in New Issue
Block a user