aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2014-03-28 14:59:05 +0100
committerBjörn Schießle <schiessle@owncloud.com>2014-03-28 14:59:05 +0100
commit7adb5ae2c58c52c2a8e565260d61ebf19fb5a101 (patch)
treeb32a92ce30d676d8bc4f44704cceffc9c34792f8
parent70db348475164ad595d3f7863b078df9efb236dc (diff)
parentb9100bc2de3cd94b386ae4c1dff5e0f3c2086f9b (diff)
downloadnextcloud-server-7adb5ae2c58c52c2a8e565260d61ebf19fb5a101.tar.gz
nextcloud-server-7adb5ae2c58c52c2a8e565260d61ebf19fb5a101.zip
Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
don't write file if opening a stream to encrypt the data fails
-rw-r--r--apps/files_encryption/lib/proxy.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index bae1fded53d..6549273c8f1 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -128,6 +128,8 @@ class Proxy extends \OC_FileProxy {
// re-enable proxy - our work is done
\OC_FileProxy::$enabled = $proxyStatus;
+ } else {
+ return false;
}
}
}