diff options
| author | Florian Steinel <fsteinel@gentoo.de.flonet.net> | 2016-10-13 16:02:18 +0200 |
|---|---|---|
| committer | Florian Steinel <root@hub.toppoint.de> | 2016-10-22 05:07:06 +0200 |
| commit | ca97130a296bcf0d17b63d07f328c841731b3e58 (patch) | |
| tree | 9849e77b3c097a36ca8fb8bea6c2bfa14bd60696 /Zotlabs | |
| parent | 9fea44cbc36e2e8bb5b2b521694d797e0eadc456 (diff) | |
| download | volse-hubzilla-ca97130a296bcf0d17b63d07f328c841731b3e58.tar.gz volse-hubzilla-ca97130a296bcf0d17b63d07f328c841731b3e58.tar.bz2 volse-hubzilla-ca97130a296bcf0d17b63d07f328c841731b3e58.zip | |
add column display_path to inserts into attachment, as this column is a not null column
Conflicts:
Zotlabs/Storage/Directory.php
include/attach.php
amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index ad450b2dd..b196e4d2d 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()), + dbesc((($this->os_path) ? $this->os_path . '/' : '')), + dbesc((($this->red_path) ? $this->red_path . '/' : '')), dbesc($allow_cid), dbesc($allow_gid), dbesc($deny_cid), |