upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Dont swallow exception when inserting mimetypes if we're inside a transaction

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2017-08-25 14:51:57 +02:00 committed by Morris Jobke
parent 2bf15eda26
commit 18908af87b
No known key found for this signature in database
GPG key ID: FE03C3A163FEDE68
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Files/Type/Loader.php
View file

@ -119,6 +119,10 @@ class Loader implements IMimeTypeLoader {
]);
$qb->execute();
} catch (UniqueConstraintViolationException $e) {
if ($this->dbConnection->inTransaction()) {
// if we're inside a transaction we can't recover safely
throw $e;
}
// something inserted it before us
}