diff options
| author | hubzilla <git@macgirvin.com> | 2016-05-18 12:16:20 +1000 |
|---|---|---|
| committer | hubzilla <git@macgirvin.com> | 2016-05-18 12:16:20 +1000 |
| commit | 9a64c6b9f79a032e192eac31be10017bf8f5fa18 (patch) | |
| tree | 57b04a35ef55af0b0b19f1554435527f0bd90215 /Zotlabs | |
| parent | 20cb4130d47028cbedf09f8da9feb6ccf8f759db (diff) | |
| parent | bfbe6c166081608deaa1e388f6287a1bf933c0c6 (diff) | |
| download | volse-hubzilla-9a64c6b9f79a032e192eac31be10017bf8f5fa18.tar.gz volse-hubzilla-9a64c6b9f79a032e192eac31be10017bf8f5fa18.tar.bz2 volse-hubzilla-9a64c6b9f79a032e192eac31be10017bf8f5fa18.zip | |
Merge pull request #389 from sasiflo/dev_sasiflo_sync
Synchronization: Directory creation on sync import corrected.
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 3c0cff6ef..84368d07e 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -194,7 +194,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { * @return null|string ETag */ public function createFile($name, $data = null) { - logger($name, LOGGER_DEBUG); + logger('create file in directory ' . $name, LOGGER_DEBUG); if (! $this->auth->owner_id) { logger('permission denied ' . $name); @@ -358,7 +358,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { * @return void */ public function createDirectory($name) { - logger($name, LOGGER_DEBUG); + logger('create directory ' . $name, LOGGER_DEBUG); if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) { throw new DAV\Exception\Forbidden('Permission denied.'); @@ -372,7 +372,9 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash)); if($result['success']) { - $sync = attach_export_data($r[0],$ret['data']['hash']); + $sync = attach_export_data($r[0],$result['data']['hash']); + logger('createDirectory: attach_export_data returns $sync:' . print_r($sync, true), LOGGER_DEBUG); + if($sync) { build_sync_packet($r[0]['channel_id'],array('file' => array($sync))); } @@ -563,4 +565,4 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { $free ); } -}
\ No newline at end of file +} |