Fix warning when resetting user's password with masterkey encryption

owncloud · Dec 4, 2019 · ba596e8 · ba596e8
1 parent 471637d
commit ba596e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/changelog/unreleased/36523 b/changelog/unreleased/36523
@@ -0,0 +1,5 @@
+Bugfix: suppress warning when resetting user password with masterkey encryption
+
+When an admin wanted to reset user's password over the Users management page with masterkey encryption in place, a warning was displayed about data recovery not being available. The behavior has now been fixed.  
+
+https://github.com/owncloud/core/pull/36523
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
@@ -186,6 +186,9 @@ private function formatUserForIndex(IUser $user, array $userGroups = null) {
 					// user also has recovery mode enabled
 					$restorePossible = true;
 				}
+			} else {
+				// masterkey encryption is active
+				$restorePossible = true;
 			}
 		} else {
 			// recovery is possible if encryption is disabled (plain files are