kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix error when un-decryptable files would break the export.

Browse Source
This commit is contained in:
James Cole
2018-04-29 07:42:17 +02:00
parent 9cbbd581ee
commit 8acb9f4056
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Export/Collector/AttachmentCollector.php
View File

@@ -94,7 +94,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
*/ */
private function exportAttachment(Attachment $attachment): bool private function exportAttachment(Attachment $attachment): bool
{ {
$file = $attachment->fileName(); $file = $attachment->fileName();
$decrypted = false;
if ($this->uploadDisk->exists($file)) { if ($this->uploadDisk->exists($file)) {
try { try {
$decrypted = Crypt::decrypt($this->uploadDisk->get($file)); $decrypted = Crypt::decrypt($this->uploadDisk->get($file));
@@ -104,6 +105,9 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
return false; return false;
} }
} }
if ($decrypted === false) {
return false;
}
$exportFile = $this->exportFileName($attachment); $exportFile = $this->exportFileName($attachment);
$this->exportDisk->put($exportFile, $decrypted); $this->exportDisk->put($exportFile, $decrypted);
$this->getEntries()->push($exportFile); $this->getEntries()->push($exportFile);