extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-14 10:28:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* PostgreSQL: fixed not working installation (access to not yet existing table stalls transaction)

Browse Source
This commit is contained in:
Ralf Becker
2014-06-25 12:43:11 +00:00
parent c5ec3245d3
commit 2ee9082f2e
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -230,7 +230,12 @@ class accounts_sql
if ($data['account_id'] < 0 && class_exists('emailadmin_smtp_sql', isset($data['account_email'])))
{
try {
if (empty($data['account_email']))
if (isset($GLOBALS['egw_info']['apps']) && !isset($GLOBALS['egw_info']['apps']['emailadmin']) ||
isset($GLOBALS['egw_setup']) && !in_array(emailadmin_smtp_sql::TABLE, $this->db->table_names(true)))
{
// cant store email, if emailadmin not (yet) installed
}
elseif (empty($data['account_email']))
{
$this->db->delete(emailadmin_smtp_sql::TABLE, array(
'account_id' => $data['account_id'],
@ -247,7 +252,7 @@ class accounts_sql
), __LINE__, __FILE__, emailadmin_smtp_sql::APP);
}
}
// ignore not (yet) existing mailaccounts table
// ignore not (yet) existing mailaccounts table (does NOT work in PostgreSQL, because of transaction!)
catch (egw_exception_db $e) {
unset($e);
}