diff options
| author | Frank Karlitschek <karlitschek@gmx.de> | 2015-02-06 14:03:53 -0500 |
|---|---|---|
| committer | Frank Karlitschek <karlitschek@gmx.de> | 2015-02-06 14:03:53 -0500 |
| commit | 492fadd30240d7d896781986f8b8c10c79314273 (patch) | |
| tree | 985a28efd4a4a315f941af83cb93b5a89d93e352 | |
| parent | 4d91fa4c93aa88480a52eed40fe65d7fdd4912d4 (diff) | |
| parent | b2e13229fa6d31116168caee053694bf515a4ba6 (diff) | |
| download | nextcloud-server-492fadd30240d7d896781986f8b8c10c79314273.tar.gz nextcloud-server-492fadd30240d7d896781986f8b8c10c79314273.zip | |
Merge pull request #13952 from owncloud/fix_migration
[encryption] don't check if we have a valid user during migration
| -rw-r--r-- | apps/files_encryption/lib/migration.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/apps/files_encryption/lib/migration.php b/apps/files_encryption/lib/migration.php index cf5552f84ac..8af633aeaff 100644 --- a/apps/files_encryption/lib/migration.php +++ b/apps/files_encryption/lib/migration.php @@ -256,11 +256,7 @@ class Migration { if (substr($file, 0, strlen($filename) +1) === $filename . '.') { $uid = $this->getUidFromShareKey($file, $filename, $trash); - if ($uid === $this->public_share_key_id || - $uid === $this->recovery_key_id || - \OCP\User::userExists($uid)) { - $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey'); - } + $this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey'); } } |