Merge pull request #13952 from owncloud/fix_migration

[encryption] don't check if we have a valid user during migration
remotes/origin/log-external-deletes
Frank Karlitschek 12 years ago
commit 492fadd302
  1. 6
      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');
}
}

Loading…
Cancel
Save