diff options
| author | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
| commit | 2c8a243ece79af05e30b1926bd372698d30f7aab (patch) | |
| tree | 9cc868f56a5456c59eb6e230803f2966c2ce9735 /include/photos.php | |
| parent | 3372fb0761353f646ae2b7bd168650eea5fd6211 (diff) | |
| parent | af7a31cd1400a6b2f21e7c0a622ab448179f0ef8 (diff) | |
| download | volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.gz volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.bz2 volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Daemon/Expire.php
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/photos.php b/include/photos.php index ee662f707..631660d7a 100644 --- a/include/photos.php +++ b/include/photos.php @@ -388,7 +388,7 @@ function photo_upload($channel, $observer, $args) { 'title' => $title, 'created' => $p['created'], 'edited' => $p['edited'], - 'id' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash, + 'id' => z_root() . '/item/' . $photo_hash, 'link' => $link, 'body' => $summary ); @@ -438,13 +438,13 @@ function photo_upload($channel, $observer, $args) { } } else { - $uuid = item_message_id(); - $mid = z_root() . '/item/' . $uuid; + // $uuid = item_message_id(); + $mid = z_root() . '/item/' . $photo_hash; $arr = [ 'aid' => $account_id, 'uid' => $channel_id, - 'uuid' => $uuid, + 'uuid' => $photo_hash, 'mid' => $mid, 'parent_mid' => $mid, 'item_hidden' => $item_hidden, |