diff --git a/modules/geocoder_field/geocoder_field.module b/modules/geocoder_field/geocoder_field.module index 00beb77..bab5083 100644 --- a/modules/geocoder_field/geocoder_field.module +++ b/modules/geocoder_field/geocoder_field.module @@ -128,7 +128,7 @@ function geocoder_field_entity_presave(EntityInterface $entity) { $dumper_manager = \Drupal::service('plugin.manager.geocoder.dumper'); $geocoder_config = \Drupal::configFactory()->get('geocoder.settings'); - $geocoder_plugins_options = $geocoder_config->get('plugins_options'); + $geocoder_plugins_options = !empty($geocoder_config->get('plugins_options')) ? $geocoder_config->get('plugins_options') : []; // Eventually converts Plugins Options in Beta1 Json format. // @TODO: This should be removed before the stable release 8.x-2.0. diff --git a/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php b/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php index 3a03043..04fb45f 100644 --- a/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php +++ b/modules/geocoder_field/src/Plugin/Field/GeocodeFormatterBase.php @@ -217,7 +217,7 @@ abstract class GeocodeFormatterBase extends FormatterBase implements ContainerFa $elements = []; $dumper = $this->dumperPluginManager->createInstance($this->getSetting('dumper')); $provider_plugins = $this->getEnabledProviderPlugins(); - $geocoder_plugins_options = $this->config->get('plugins_options'); + $geocoder_plugins_options = !empty($this->config->get('plugins_options')) ? $this->config->get('plugins_options') : []; // Eventually converts Plugins Options in Beta1 Json format. // @TODO: This should be removed before the stable release 8.x-2.0.