From ca37d782ed607cb485eaf9befc2e3580c89b32a8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 26 Oct 2019 16:56:30 +0200 Subject: [PATCH] Fix #2773 --- .travis.yml | 2 +- app/Factory/TransactionGroupFactory.php | 2 +- changelog.md | 6 ++++++ config/firefly.php | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6f9b990ef..62b920cf77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: required language: bash env: - - VERSION=4.8.1.7 + - VERSION=4.8.1.8 dist: xenial diff --git a/app/Factory/TransactionGroupFactory.php b/app/Factory/TransactionGroupFactory.php index bb69039030..3fa3163358 100644 --- a/app/Factory/TransactionGroupFactory.php +++ b/app/Factory/TransactionGroupFactory.php @@ -58,7 +58,7 @@ class TransactionGroupFactory public function create(array $data): TransactionGroup { $this->journalFactory->setUser($this->user); - $this->journalFactory->setErrorOnHash($data['error_if_duplicate_hash']); + $this->journalFactory->setErrorOnHash($data['error_if_duplicate_hash'] ?? false); $collection = $this->journalFactory->create($data); $title = $data['group_title'] ?? null; diff --git a/changelog.md b/changelog.md index e29549f1e0..3537dbd4e6 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). + +## [4.8.1.8 (API 0.10.5)] - 2019-10-26 + +### Fixed +- [Issue 2773](https://github.com/firefly-iii/firefly-iii/issues/2773) Error when importing transactions. + ## [4.8.1.7 (API 0.10.5)] - 2019-10-26 ### Fixed diff --git a/config/firefly.php b/config/firefly.php index d838f8d7cb..f0539ed78a 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -125,7 +125,7 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.8.1.7', + 'version' => '4.8.1.8', 'api_version' => '0.10.5', 'db_version' => 11, 'maxUploadSize' => 15242880,