aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-04-03 10:51:34 +0200
committerMario <mario@mariovavti.com>2020-04-03 10:51:34 +0200
commit31fea1014ef634fe1457451332b8e478768c5645 (patch)
tree47c05dd658a889725c4455ac4f2f19bb4e1da7e9 /include
parent898fea1e0e5b2bb3d0689a09e6f287a212108ab5 (diff)
parenta3acec96745f90443de84d8503334b3a204436fb (diff)
downloadvolse-hubzilla-31fea1014ef634fe1457451332b8e478768c5645.tar.gz
volse-hubzilla-31fea1014ef634fe1457451332b8e478768c5645.tar.bz2
volse-hubzilla-31fea1014ef634fe1457451332b8e478768c5645.zip
Merge branch 'dev' into 'dev'
fix app links in DB when doing a site rename See merge request hubzilla/core!1846
Diffstat (limited to 'include')
-rw-r--r--include/photos.php8
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,