diff --git a/CHANGELOG.md b/CHANGELOG.md index 86344f9c8..8e8a9589b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixes + +- [Fix asset_lookup and term_lookup exception messages #731](https://github.com/farmOS/farmOS/pull/731) + ## [2.2.0] 2023-10-06 This is the second minor release of the farmOS 2.x branch, following diff --git a/modules/core/import/modules/csv/src/Plugin/migrate/process/AssetLookup.php b/modules/core/import/modules/csv/src/Plugin/migrate/process/AssetLookup.php index bdd7a2389..ee13f3c9a 100644 --- a/modules/core/import/modules/csv/src/Plugin/migrate/process/AssetLookup.php +++ b/modules/core/import/modules/csv/src/Plugin/migrate/process/AssetLookup.php @@ -107,7 +107,7 @@ class AssetLookup extends EntityLookup { // If there are still no results, throw an exception and skip the row. if (empty($results)) { - throw new MigrateSkipRowException('Asset not found: @asset', ['@asset' => $value]); + throw new MigrateSkipRowException('Asset not found: ' . $value); } return $results; diff --git a/modules/core/import/modules/csv/src/Plugin/migrate/process/TermLookup.php b/modules/core/import/modules/csv/src/Plugin/migrate/process/TermLookup.php index 125de6fc5..87afff9e6 100644 --- a/modules/core/import/modules/csv/src/Plugin/migrate/process/TermLookup.php +++ b/modules/core/import/modules/csv/src/Plugin/migrate/process/TermLookup.php @@ -64,7 +64,7 @@ class TermLookup extends EntityLookup { // If there are no results, throw an exception and skip the row. if (empty($results)) { - throw new MigrateSkipRowException('Term not found: @term', ['@term' => $value]); + throw new MigrateSkipRowException('Term not found: ' . $value); } return $results;