aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-26 17:25:58 -0700
committerzotlabs <mike@macgirvin.com>2018-04-26 17:25:58 -0700
commit38e99c83544ca89edabe6f0786c5faac39f07e95 (patch)
tree812f6863e185e00f8919cfa3a7031b1b1cd02551 /Zotlabs
parentf32ba0656430929ba5af3d1ef730d7ada98c0ea7 (diff)
downloadvolse-hubzilla-38e99c83544ca89edabe6f0786c5faac39f07e95.tar.gz
volse-hubzilla-38e99c83544ca89edabe6f0786c5faac39f07e95.tar.bz2
volse-hubzilla-38e99c83544ca89edabe6f0786c5faac39f07e95.zip
set the 'force' flag on attach_mkdir when initiated from a DAV operation. This will report success if it already exists rather than throwing an exception.
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Storage/Directory.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index a2ae0fee8..d063eed40 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -389,8 +389,12 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
);
if ($r) {
+
+ // When initiated from DAV, set the 'force' flag on attach_mkdir(). This will cause the operation to report success even if the
+ // folder already exists.
+
require_once('include/attach.php');
- $result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash));
+ $result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash, 'force' => true));
if($result['success']) {
$sync = attach_export_data($r[0],$result['data']['hash']);