aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Storage/Directory.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-23 07:27:48 +1100
committerGitHub <noreply@github.com>2016-10-23 07:27:48 +1100
commitac5ad0b9cecc0f4ec912e654ab0690e391170cd1 (patch)
tree964997c02bc6b022996dd4eea23145f9ee9c6bf2 /Zotlabs/Storage/Directory.php
parent823c0ebb47a8a39dbecae6902b0fe0dce158e417 (diff)
parent43de0e7f169abc2f9669bcda4c3808e20cfe46a0 (diff)
downloadvolse-hubzilla-ac5ad0b9cecc0f4ec912e654ab0690e391170cd1.tar.gz
volse-hubzilla-ac5ad0b9cecc0f4ec912e654ab0690e391170cd1.tar.bz2
volse-hubzilla-ac5ad0b9cecc0f4ec912e654ab0690e391170cd1.zip
Merge pull request #562 from fsteinel/issue-561
add column display_path to inserts into attachment, as this column is…
Diffstat (limited to 'Zotlabs/Storage/Directory.php')
-rw-r--r--Zotlabs/Storage/Directory.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index ad450b2dd..5d078b04e 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -244,8 +244,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
$deny_gid = $c[0]['channel_deny_gid'];
}
- $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, allow_cid, allow_gid, deny_cid, deny_gid )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+ $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
+ VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($c[0]['channel_account_id']),
intval($c[0]['channel_id']),
dbesc($hash),
@@ -260,6 +260,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
dbesc($f),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
+ '', //TODO: use os_path
+ '', //TODO: use display_path
dbesc($allow_cid),
dbesc($allow_gid),
dbesc($deny_cid),