summaryrefslogtreecommitdiffstats
path: root/apps/encryption/appinfo
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-03-31 12:01:51 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:28 +0200
commit4843e5ce301c4ac1e4cccf21b7d33e5e2a2b3042 (patch)
tree3196f9d642f73a1d62c874cc02241427777f9280 /apps/encryption/appinfo
parent0f28d538a0af769220bcba120f0a7340dd0aba5f (diff)
downloadnextcloud-server-4843e5ce301c4ac1e4cccf21b7d33e5e2a2b3042.tar.gz
nextcloud-server-4843e5ce301c4ac1e4cccf21b7d33e5e2a2b3042.zip
use password change logic to userhooks to avoid recursions
Diffstat (limited to 'apps/encryption/appinfo')
-rw-r--r--apps/encryption/appinfo/application.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 21d7f3e737f..be432b1a5a8 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -77,7 +77,8 @@ class Application extends \OCP\AppFramework\App {
$container->query('UserSetup'),
$server->getUserSession(),
$container->query('Util'),
- new \OCA\Encryption\Session($server->getSession())),
+ new \OCA\Encryption\Session($server->getSession()),
+ $container->query('Recovery'))
]);
$hookManager->fireHooks();
@@ -126,8 +127,7 @@ class Application extends \OCP\AppFramework\App {
$server->getConfig(),
$server->getUserSession(),
new \OCA\Encryption\Session($server->getSession()),
- $server->getLogger(),
- $c->query('Recovery')
+ $server->getLogger()
);
});