diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
| commit | bef8879cb1356b880279c6104fcffb0752414a7c (patch) | |
| tree | ce3733df7ca168f4afe7e963dc81b6f00944c34c /include/photos.php | |
| parent | 1cb45c30e9032794b7827738cc28f7728ac28677 (diff) | |
| parent | 5b7124f0daeca4aa619f6411ee373d9ff5a22b7b (diff) | |
| download | volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.gz volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.bz2 volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.zip | |
Merge pull request #7 from friendica/master
Merge from main project
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/photos.php b/include/photos.php index badbbd791..2393153c6 100644 --- a/include/photos.php +++ b/include/photos.php @@ -44,9 +44,10 @@ function photo_upload($channel, $observer, $args) { * */ - $r = q("SELECT * FROM photo WHERE album = '%s' AND uid = %d AND created > UTC_TIMESTAMP() - INTERVAL 3 HOUR ", + $r = q("SELECT * FROM photo WHERE album = '%s' AND uid = %d AND created > %s - INTERVAL %s ", dbesc($album), - intval($channel_id) + intval($channel_id), + db_utcnow(), db_quoteinterval('3 HOUR') ); if((! $r) || ($album == t('Profile Photos'))) $visible = 1; @@ -178,7 +179,7 @@ function photo_upload($channel, $observer, $args) { if($args['title']) $p['title'] = $args['title']; if($args['description']) - $p['desciprion'] = $args['description']; + $p['description'] = $args['description']; $r1 = $ph->save($p); @@ -291,7 +292,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 created desc", + $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", intval($channel_id), intval(PHOTO_NORMAL), intval(PHOTO_PROFILE) @@ -431,7 +432,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { // Create item container $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP; - $item_restrict = (($visible) ? ITEM_HIDDEN : ITEM_VISIBLE); + $item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN); $title = ''; $mid = item_message_id(); |