summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2018-02-14 10:08:28 +0100
committerGitHub <noreply@github.com>2018-02-14 10:08:28 +0100
commitd1fb939e863a6f476d3a0a49d6d9717ff0d713a0 (patch)
tree9ead9e1f03c55361ae10464e306d8511039a81a9 /lib
parentff1b343c4a294d790d449097300e5e8082e74feb (diff)
parente2974f1133693c022585d3758df142e0f385cb3e (diff)
downloadnextcloud-server-d1fb939e863a6f476d3a0a49d6d9717ff0d713a0.tar.gz
nextcloud-server-d1fb939e863a6f476d3a0a49d6d9717ff0d713a0.zip
Merge pull request #8338 from nextcloud/simplify-return-statement
Simplify return statement
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Wrapper/Encryption.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php
index e40a4830953..b65db054055 100644
--- a/lib/private/Files/Storage/Wrapper/Encryption.php
+++ b/lib/private/Files/Storage/Wrapper/Encryption.php
@@ -351,9 +351,7 @@ class Encryption extends Wrapper {
// need to stream copy file by file in case we copy between a encrypted
// and a unencrypted storage
$this->unlink($path2);
- $result = $this->copyFromStorage($this, $path1, $path2);
-
- return $result;
+ return $this->copyFromStorage($this, $path1, $path2);
}
/**