only check for recovery key if someone else than the user wants to change the password

Conflicts:

	settings/ajax/changepassword.php

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 5bdc589da34023302b370963a9805733eac35be7..96a17c51b466ad7027a7b600fa2631315b65f729 100644 (file)
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -29,7 +29,7 @@ if (is_null($userstatus)) {
 }
 
 if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') {
-//handle the recovery case
+       //handle the recovery case
        $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
        $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');