diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-12 15:19:45 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-04-13 11:13:19 +0200 |
| commit | f23a36b0a6f4721bc923a952d2644dddfe8b13fa (patch) | |
| tree | 786e3e887a5827ad5fb4872a55cfb7ac1c585774 /lib | |
| parent | 01f3698175694d9994c8ef0bb91745582edf3345 (diff) | |
| download | nextcloud-server-f23a36b0a6f4721bc923a952d2644dddfe8b13fa.tar.gz nextcloud-server-f23a36b0a6f4721bc923a952d2644dddfe8b13fa.zip | |
Add activities when email or password is changed
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | lib/private/ServerContainer.php | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index feb54ec0331..1db6b84c5fb 100644 --- a/lib/base.php +++ b/lib/base.php @@ -727,6 +727,9 @@ class OC { self::registerAccountHooks(); self::registerSettingsHooks(); + $settings = new \OC\Settings\Application(); + $settings->register(); + //make sure temporary files are cleaned up $tmpManager = \OC::$server->getTempManager(); register_shutdown_function(array($tmpManager, 'clean')); diff --git a/lib/private/ServerContainer.php b/lib/private/ServerContainer.php index e7b1ed2dad7..3391dd83a04 100644 --- a/lib/private/ServerContainer.php +++ b/lib/private/ServerContainer.php @@ -102,6 +102,15 @@ class ServerContainer extends SimpleContainer { // Didn't find the service or the respective app container, // ignore it and fall back to the core container. } + } else if (strpos($name, 'OC\\Settings\\') === 0 && substr_count($name, '\\') >= 3) { + $segments = explode('\\', $name); + try { + $appContainer = $this->getAppContainer(strtolower($segments[1])); + return $appContainer->queryNoFallback($name); + } catch (QueryException $e) { + // Didn't find the service or the respective app container, + // ignore it and fall back to the core container. + } } return parent::query($name); |