summaryrefslogtreecommitdiffstats
path: root/apps/encryption_dummy
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-27 14:32:19 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-27 14:32:19 +0200
commit678b7d7e4d042ede16261c7eae659b10e597fd55 (patch)
tree1cedacc0d5cc406af50c90be8e656356c60f59ad /apps/encryption_dummy
parent93c25a1f4af11483baaef447faa235c938b2a444 (diff)
parent27683f944289e7b37f20ec7d877ed295d5ca66a3 (diff)
downloadnextcloud-server-678b7d7e4d042ede16261c7eae659b10e597fd55.tar.gz
nextcloud-server-678b7d7e4d042ede16261c7eae659b10e597fd55.zip
Merge pull request #15860 from owncloud/enc_fallback_old_encryption
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
Diffstat (limited to 'apps/encryption_dummy')
-rw-r--r--apps/encryption_dummy/lib/dummymodule.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/encryption_dummy/lib/dummymodule.php b/apps/encryption_dummy/lib/dummymodule.php
index e974ee468e2..141edfb58f9 100644
--- a/apps/encryption_dummy/lib/dummymodule.php
+++ b/apps/encryption_dummy/lib/dummymodule.php
@@ -53,6 +53,7 @@ class DummyModule implements IEncryptionModule {
*
* @param string $path to the file
* @param string $user who read/write the file (null for public access)
+ * @param string $mode php stream open mode
* @param array $header contains the header data read from the file
* @param array $accessList who has access to the file contains the key 'users' and 'public'
*
@@ -60,7 +61,7 @@ class DummyModule implements IEncryptionModule {
* written to the header, in case of a write operation
* or if no additional data is needed return a empty array
*/
- public function begin($path, $user, array $header, array $accessList) {
+ public function begin($path, $user, $mode, array $header, array $accessList) {
return array();
}