diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Model/City.php b/public/typo3conf/ext/ep_products/Classes/Domain/Model/City.php index 8929ae22..f8c30106 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Model/City.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Model/City.php @@ -125,7 +125,7 @@ class City extends AbstractDestination implements TeaserInterface { $headerImages = $this->headerImages; - if ($headerImages->count() === 0) { + if ($headerImages->count() === 0 && null !== $this->getRegion()) { $headerImages = $this->getRegion()->getHeaderImages(); } diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php b/public/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php index efdab7c9..4ceec259 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php @@ -696,7 +696,7 @@ class Hotel extends AbstractEntity implements TeaserInterface { $headerImages = $this->headerImages; - if ($headerImages->count() === 0) { + if ($headerImages->count() === 0 && null !== $this->getCity()) { $headerImages = $this->getCity()->getHeaderImages(); } diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php b/public/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php index 486bfde6..d268f7f0 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php @@ -858,7 +858,7 @@ class Product extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements { $headerImages = $this->headerImages; - if ($headerImages->count() === 0) { + if ($headerImages->count() === 0 && null !== $this->getRegion()) { $headerImages = $this->getRegion()->getHeaderImages(); } diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Model/Region.php b/public/typo3conf/ext/ep_products/Classes/Domain/Model/Region.php index ad893bdb..4f50d295 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Model/Region.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Model/Region.php @@ -285,7 +285,7 @@ class Region extends AbstractDestination implements TeaserInterface { $headerImages = $this->headerImages; - if ($headerImages->count() === 0) { + if ($headerImages->count() === 0 && null !== $this->getCountry()) { $headerImages = $this->getCountry()->getHeaderImages(); }