diff options
| author | Mario <mario@mariovavti.com> | 2022-11-04 10:31:05 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-11-04 10:31:05 +0000 |
| commit | 5502f1cc63d87bed8198d360ae0e8e7c5fa58f44 (patch) | |
| tree | f65e899b792ef86f99539b06232e5baf2fe80714 /Zotlabs/Lib | |
| parent | b55801323c19928fc7cb82c007856087e3d6545a (diff) | |
| download | volse-hubzilla-5502f1cc63d87bed8198d360ae0e8e7c5fa58f44.tar.gz volse-hubzilla-5502f1cc63d87bed8198d360ae0e8e7c5fa58f44.tar.bz2 volse-hubzilla-5502f1cc63d87bed8198d360ae0e8e7c5fa58f44.zip | |
do not update the guid on xchan/hubloc updates and define some array keys
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index b93df8a02..963a8ff75 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1702,9 +1702,8 @@ class Activity { ); // update existing xchan record - q("update xchan set xchan_name = '%s', xchan_guid = '%s', xchan_pubkey = '%s', xchan_addr = '%s', xchan_network = 'activitypub', xchan_name_date = '%s' where xchan_hash = '%s'", + q("update xchan set xchan_name = '%s', xchan_pubkey = '%s', xchan_addr = '%s', xchan_network = 'activitypub', xchan_name_date = '%s' where xchan_hash = '%s'", dbesc(escape_tags($name)), - dbesc($url), dbesc(escape_tags($pubkey)), dbesc(escape_tags($webfinger_addr)), dbescdate(datetime_convert()), @@ -1712,8 +1711,7 @@ class Activity { ); // update existing hubloc record - q("update hubloc set hubloc_guid = '%s', hubloc_addr = '%s', hubloc_network = 'activitypub', hubloc_url = '%s', hubloc_host = '%s', hubloc_callback = '%s', hubloc_updated = '%s', hubloc_id_url = '%s' where hubloc_hash = '%s'", - dbesc($url), + q("update hubloc set hubloc_addr = '%s', hubloc_network = 'activitypub', hubloc_url = '%s', hubloc_host = '%s', hubloc_callback = '%s', hubloc_updated = '%s', hubloc_id_url = '%s' where hubloc_hash = '%s'", dbesc(escape_tags($webfinger_addr)), dbesc($baseurl), dbesc($hostname), @@ -2208,6 +2206,8 @@ class Activity { $s['owner_xchan'] = $act->actor['id']; $s['author_xchan'] = $act->actor['id']; + $content = []; + if (is_array($act->obj)) { $content = self::get_content($act->obj); } |