Merge 6e9d62b into efca22b

cross-solution · Oct 18, 2017 · 29350a2 · 29350a2
2 parents efca22b + 6e9d62b
commit 29350a2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/module/Auth/src/Auth/Entity/User.php b/module/Auth/src/Auth/Entity/User.php
@@ -421,9 +421,12 @@ public function getSettings($module)
             }
         }
 
-        $settings = $this->settingsEntityResolver->getNewSettingsEntity($module);
-        $this->settings->add($settings);
-        return $settings;
+        if ($this->settingsEntityResolver) {
+            $settings = $this->settingsEntityResolver->getNewSettingsEntity($module);
+            $this->settings->add($settings);
+            return $settings;
+        }
+
     }
 
     /** {@inheritdoc} */