diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-10-06 16:57:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-06 16:57:39 +0200 |
| commit | a0b34dfd2f5e6ed1ea5e35692816acf73f3ede4e (patch) | |
| tree | 335f901a7493d920ad6a382647fdbcb5193af7ce /lib/private/AppFramework | |
| parent | 6d688e89c1457a682fcc07e595e96014ada36add (diff) | |
| parent | ed30b1f64537e94fb9874cd5f52be03c5e66899b (diff) | |
| download | nextcloud-server-a0b34dfd2f5e6ed1ea5e35692816acf73f3ede4e.tar.gz nextcloud-server-a0b34dfd2f5e6ed1ea5e35692816acf73f3ede4e.zip | |
Merge pull request #1629 from nextcloud/cleanup-settings-application
Cleanup settings Application class
Diffstat (limited to 'lib/private/AppFramework')
| -rw-r--r-- | lib/private/AppFramework/Utility/SimpleContainer.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 8d5bceb0b87..889f17cbc6a 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -68,6 +68,9 @@ class SimpleContainer extends Container implements IContainer { // Service not found, use the default value when available if ($parameter->isDefaultValueAvailable()) { $parameters[] = $parameter->getDefaultValue(); + } else if ($parameterClass !== null) { + $resolveName = $parameter->getName(); + $parameters[] = $this->query($resolveName); } else { throw $e; } |