diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 19:43:53 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 19:43:53 -0700 |
| commit | da7abbb089ccb586ec8c7f33fcc21fb80b3fd3c2 (patch) | |
| tree | 17156b93aece10069f2855c1b935c3bcae68cfa3 /include/photos.php | |
| parent | eae241df5682fe35ab875608164f1745d80c2301 (diff) | |
| download | volse-hubzilla-da7abbb089ccb586ec8c7f33fcc21fb80b3fd3c2.tar.gz volse-hubzilla-da7abbb089ccb586ec8c7f33fcc21fb80b3fd3c2.tar.bz2 volse-hubzilla-da7abbb089ccb586ec8c7f33fcc21fb80b3fd3c2.zip | |
bring the new photo schema into play
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/photos.php b/include/photos.php index badf7cb10..dcf2978bb 100644 --- a/include/photos.php +++ b/include/photos.php @@ -156,7 +156,7 @@ function photo_upload($channel, $observer, $args) { $errors = false; $p = array('aid' => $account_id, 'uid' => $channel_id, 'xchan' => $visitor, 'resource_id' => $photo_hash, - 'filename' => $filename, 'album' => $album, 'scale' => 0, 'photo_flags' => PHOTO_NORMAL, + 'filename' => $filename, 'album' => $album, 'scale' => 0, 'photo_usage' => PHOTO_NORMAL, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny ); @@ -313,7 +313,7 @@ function photos_albums_list($channel, $observer) { $sql_extra = permissions_sql($channel_id); - $albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and ( photo_flags = %d or photo_flags = %d ) $sql_extra group by album order by max(created) desc", + $albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and photo_usage IN ( %d, %d ) $sql_extra group by album order by max(created) desc", intval($channel_id), intval(PHOTO_NORMAL), intval(PHOTO_PROFILE) @@ -393,7 +393,7 @@ function photos_list_photos($channel, $observer, $album = '') { $ret = array('success' => false); - $r = q("select resource_id, created, edited, title, description, album, filename, type, height, width, size, scale, profile, photo_flags, allow_cid, allow_gid, deny_cid, deny_gid from photo where uid = %d and ( photo_flags = %d or photo_flags = %d ) $sql_extra ", + $r = q("select resource_id, created, edited, title, description, album, filename, type, height, width, size, scale, photo_usage, allow_cid, allow_gid, deny_cid, deny_gid from photo where uid = %d and photo_usage in ( %d, %d ) $sql_extra ", intval($channel_id), intval(PHOTO_NORMAL), intval(PHOTO_PROFILE) |