* Setup: make sure interactive setup does not stall on SQL error when updating from 1.8

This commit is contained in:
Ralf Becker 2016-09-26 09:27:13 +02:00
parent d99a283929
commit 07fbace534

View File

@ -1074,6 +1074,7 @@ class setup
*/ */
function accounts_exist() function accounts_exist()
{ {
try {
if (!$this->setup_account_object()) return false; if (!$this->setup_account_object()) return false;
$this->accounts->search(array( $this->accounts->search(array(
@ -1095,7 +1096,11 @@ class setup
'query_type' => 'lid', 'query_type' => 'lid',
'query' => 'anonymous', 'query' => 'anonymous',
)); ));
}
catch (Api\Db\Exception $e) {
_egw_log_exception($e);
return false;
}
return !$this->accounts->total; return !$this->accounts->total;
} }