diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-17 17:44:31 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-17 17:44:31 -0700 |
| commit | 6ab20eb1b50da91ba35911fea8b09f2ef8e461fd (patch) | |
| tree | 1c19bb5b412562a7ca33a97ff19c5aac156f8016 /mod/photos.php | |
| parent | c6c17182e5c8d48e2ac16039a92df1cf4596fd88 (diff) | |
| download | volse-hubzilla-6ab20eb1b50da91ba35911fea8b09f2ef8e461fd.tar.gz volse-hubzilla-6ab20eb1b50da91ba35911fea8b09f2ef8e461fd.tar.bz2 volse-hubzilla-6ab20eb1b50da91ba35911fea8b09f2ef8e461fd.zip | |
lots of work on merging photo and file albums/folders
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/photos.php b/mod/photos.php index 786194cd8..dee027cf9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -277,9 +277,8 @@ function photos_post(&$a) { if($p) { $ext = $phototypes[$p[0]['type']]; - $r = q("UPDATE `photo` SET `description` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource_id` = '%s' AND `uid` = %d", + $r = q("UPDATE `photo` SET `description` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource_id` = '%s' AND `uid` = %d", dbesc($desc), - dbesc($albname), dbesc($str_contact_allow), dbesc($str_group_allow), dbesc($str_contact_deny), @@ -421,7 +420,7 @@ function photos_post(&$a) { $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']); } - $r = attach_store($a->channel,get_observer_hash(), $_REQUEST); + $r = attach_store($a->channel,get_observer_hash(), '', $_REQUEST); if(! $r['success']) { notice($r['message'] . EOL); |