diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2021-03-11 10:52:03 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2021-03-11 12:25:31 +0000 |
| commit | f32d77e63d71326973bfe0496adeec694ca90ecf (patch) | |
| tree | f952dbf9aec95f51479ffd0940d216f9cd61e49a /app/Http/RequestHandlers/GedcomLoad.php | |
| parent | 090a06287954f43677f06ea778b3f67c029de8fe (diff) | |
| download | webtrees-f32d77e63d71326973bfe0496adeec694ca90ecf.tar.gz webtrees-f32d77e63d71326973bfe0496adeec694ca90ecf.tar.bz2 webtrees-f32d77e63d71326973bfe0496adeec694ca90ecf.zip | |
Remove vendor dir, add support for PHP 8.0, drop support for PHP 7.1 and 7.2
Diffstat (limited to 'app/Http/RequestHandlers/GedcomLoad.php')
| -rw-r--r-- | app/Http/RequestHandlers/GedcomLoad.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Http/RequestHandlers/GedcomLoad.php b/app/Http/RequestHandlers/GedcomLoad.php index 24bbc29d42..c096398146 100644 --- a/app/Http/RequestHandlers/GedcomLoad.php +++ b/app/Http/RequestHandlers/GedcomLoad.php @@ -257,7 +257,7 @@ class GedcomLoad implements RequestHandlerInterface DB::connection()->rollBack(); // Deadlock? Try again. - if ($this->causedByDeadlock($ex)) { + if ($this->causedByConcurrencyError($ex)) { return $this->viewResponse('admin/import-progress', [ 'errors' => '', 'progress' => $progress ?? 0.0, |