diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2015-01-14 11:40:22 +0100 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2015-01-14 11:40:22 +0100 |
| commit | 5745b68fa98ac1960d2986f9c846a3bd02385432 (patch) | |
| tree | 40db849a45f0516d135fc5891c5ee5e22fbb0b11 /lib/private | |
| parent | 65ee2b1de88e490672067257a6a704a697d71e1e (diff) | |
| parent | 89f17ef6fe1b33d6eaa2f4a19e9fb598b219ab26 (diff) | |
| download | nextcloud-server-5745b68fa98ac1960d2986f9c846a3bd02385432.tar.gz nextcloud-server-5745b68fa98ac1960d2986f9c846a3bd02385432.zip | |
Merge pull request #13311 from owncloud/fix_restore_keys
adapt decrypt all to the new folder structure
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/util.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index ec3640503e4..d2d286fc11e 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -692,9 +692,9 @@ class OC_Util { $encryptedFiles = false; if (OC_App::isEnabled('files_encryption') === false) { $view = new OC\Files\View('/' . OCP\User::getUser()); - $keyfilePath = '/files_encryption/keyfiles'; - if ($view->is_dir($keyfilePath)) { - $dircontent = $view->getDirectoryContent($keyfilePath); + $keysPath = '/files_encryption/keys'; + if ($view->is_dir($keysPath)) { + $dircontent = $view->getDirectoryContent($keysPath); if (!empty($dircontent)) { $encryptedFiles = true; } @@ -714,7 +714,7 @@ class OC_Util { $backupExists = false; if (OC_App::isEnabled('files_encryption') === false) { $view = new OC\Files\View('/' . OCP\User::getUser()); - $backupPath = '/files_encryption/keyfiles.backup'; + $backupPath = '/files_encryption/backup.decryptAll'; if ($view->is_dir($backupPath)) { $dircontent = $view->getDirectoryContent($backupPath); if (!empty($dircontent)) { |