Merge pull request #65 from Flowpack/dfeyer-patch-1

dfeyer · web-flow · commit 1f66140cb1d9 · 2017-08-05T18:46:59.000+02:00
BUGFIX: Empty settings break the DynamicIndexSettingService
diff --git a/Classes/Domain/Model/Index.php b/Classes/Domain/Model/Index.php
@@ -191,7 +191,7 @@ protected function getSettings()
         }
         $settings = Arrays::getValueByPath($this->settings, $path);
 
-        return $this->dynamicIndexSettingService->process($settings, $path, $this->getName());
+        return $settings !== null ? $this->dynamicIndexSettingService->process($settings, $path, $this->getName()) : $settings;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ protected function getSettings()`
`191`	`191`	`}`
`192`	`192`	`$settings = Arrays::getValueByPath($this->settings, $path);`
`193`	`193`
`194`		`- return $this->dynamicIndexSettingService->process($settings, $path, $this->getName());`
	`194`	`+ return $settings !== null ? $this->dynamicIndexSettingService->process($settings, $path, $this->getName()) : $settings;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`/**`