Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Nextcloud
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

8d2238e0

Commit 8d2238e0 authored 9 years ago by Thomas Müller

Downloads
- Plain Diff

Merge pull request #22796 from owncloud/fix-encryption-on-version-restore

Keep "encryptedVersion" when calling `\OC\Files\View::copy`

parents a0df1bb0 72c8187c

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_versions/lib/storage.php 12 additions, 10 deletions

apps/files_versions/lib/storage.php
lib/private/files/storage/wrapper/encryption.php 28 additions, 9 deletions

lib/private/files/storage/wrapper/encryption.php
tests/lib/files/storage/wrapper/encryption.php 21 additions, 6 deletions

tests/lib/files/storage/wrapper/encryption.php

with 61 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment