aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
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 /Zotlabs
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 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 02ec7614e..c50606d4f 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -323,6 +323,11 @@ class Activity {
return $ret;
}
+
+ if ($i['obj']) {
+ $ret = Activity::encode_object($i['obj']);
+ }
+
$ret['type'] = $objtype;
if ($objtype === 'Question') {