diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-27 09:54:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-27 09:54:36 +0200 |
| commit | 2e9738e20458c6bd1fa1b71f32896c09accd486d (patch) | |
| tree | f9cad3c58e5c2851ce9e4e32a0a0686155d82bde /Zotlabs/Storage | |
| parent | 00a95f4b91711cc28c9b170cfdc8ea6626d803a6 (diff) | |
| parent | 7b445a5b39b887135854ba1b9aa6d9867d584ae5 (diff) | |
| download | volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.tar.gz volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.tar.bz2 volse-hubzilla-2e9738e20458c6bd1fa1b71f32896c09accd486d.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Storage')
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 6 |
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']); |