EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/services-order'

Browse Source
This commit is contained in:
Björn Fromme
2020-06-23 17:43:48 +02:00
parent 1788aea3d3 62d22075c0
commit fea5ad753a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+3 -3
View File
@@ -456,15 +456,15 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
protected function combineServices(array $skiPass, array $servicesBoard, array $servicesIncluded) protected function combineServices(array $skiPass, array $servicesBoard, array $servicesIncluded)
{ {
$combinedServices = []; $combinedServices = [];
if ($servicesIncluded) {
array_push($combinedServices, ...$servicesIncluded);
}
if ($skiPass) { if ($skiPass) {
array_push($combinedServices, ...$skiPass); array_push($combinedServices, ...$skiPass);
} }
if ($servicesBoard) { if ($servicesBoard) {
array_push($combinedServices, ...$servicesBoard); array_push($combinedServices, ...$servicesBoard);
} }
if ($servicesIncluded) {
array_push($combinedServices, ...$servicesIncluded);
}
return $combinedServices; return $combinedServices;
} }