aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Storage
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-16 21:04:04 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-16 21:04:04 -0400
commit99354ac57622002c0bbd820235d03321406f8d39 (patch)
treef8ad698a1c901f757dfc4354721846c8be82ab7e /Zotlabs/Storage
parente7b853175154688d60d83ca5935650d1128973c6 (diff)
parentf396b1bf735a7dc9eb3632e49c1269de54777c6d (diff)
downloadvolse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.gz
volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.bz2
volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.zip
Merge remote-tracking branch 'upstream/dev' into website-import-remote
Diffstat (limited to 'Zotlabs/Storage')
-rw-r--r--Zotlabs/Storage/File.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index ecd15cc55..5a70a99f1 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -337,6 +337,10 @@ class File extends DAV\Node implements DAV\IFile {
}
}
+ if(get_pconfig($this->auth->owner_id,'system','os_delete_prohibit') && \App::$module == 'dav') {
+ throw new DAV\Exception\Forbidden('Permission denied.');
+ }
+
attach_delete($this->auth->owner_id, $this->data['hash']);
$ch = channelx_by_n($this->auth->owner_id);