aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/files
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-11-25 15:24:20 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-11-25 15:24:20 +0100
commitafe76840f8806e5fbbdf785cfa8b8857c57c702e (patch)
tree3347e6e4e87d12fa62c4ddbe0fa2d0065e905fc3 /lib/private/files
parent50f6817ce99f3870e1e8dea92eaa35a0c40553ba (diff)
parentcfdf2b997658465c70f36d4eceee76277310eb99 (diff)
downloadnextcloud-server-afe76840f8806e5fbbdf785cfa8b8857c57c702e.tar.gz
nextcloud-server-afe76840f8806e5fbbdf785cfa8b8857c57c702e.zip
Merge pull request #20705 from owncloud/fix_20648
Fix overriding function from 3rdparty warning
Diffstat (limited to 'lib/private/files')
-rw-r--r--lib/private/files/stream/encryption.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 4c328993ef7..585a697c5d1 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -167,7 +167,7 @@ class Encryption extends Wrapper {
)
));
- return self::wrapSource($source, $mode, $context, 'ocencryption', $wrapper);
+ return self::wrapSource($source, $context, 'ocencryption', $wrapper, $mode);
}
/**
@@ -181,7 +181,7 @@ class Encryption extends Wrapper {
* @return resource
* @throws \BadMethodCallException
*/
- protected static function wrapSource($source, $mode, $context, $protocol, $class) {
+ protected static function wrapSource($source, $context, $protocol, $class, $mode = 'r+') {
try {
stream_wrapper_register($protocol, $class);
if (@rewinddir($source) === false) {