From: Björn Schießle <schiessle@owncloud.com>
Date: Fri, 7 Jun 2013 18:17:48 +0000 (+0200)
Subject: only check for recovery key if someone else than the user wants to change the password
X-Git-Tag: v5.0.8~100
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aa16518f6605d1cc5311ccf5c5c78a62a75790e2;p=nextcloud-server.git

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 5bdc589da34..96a17c51b46 100644
--- 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');