diff options
| author | Max Kostikov <max@kostikov.co> | 2019-08-23 23:09:14 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-08-23 23:09:14 +0200 |
| commit | 4dbaaa63bba054b9b4d538c059b3de5a57327d31 (patch) | |
| tree | f30d74fe4df89dd8f92ca023a5d05ee1855b9663 /Zotlabs | |
| parent | 35790c584ba5a67a94556ab67ddd57c76a500084 (diff) | |
| parent | 8cc40038375c33886f7c6f7d429c33a47eab8fb9 (diff) | |
| download | volse-hubzilla-4dbaaa63bba054b9b4d538c059b3de5a57327d31.tar.gz volse-hubzilla-4dbaaa63bba054b9b4d538c059b3de5a57327d31.tar.bz2 volse-hubzilla-4dbaaa63bba054b9b4d538c059b3de5a57327d31.zip | |
Merge branch 'dev' into 'dev'
issues with image import to zot6 - wrong mid. Also label source project of...
See merge request hubzilla/core!1717
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Zotfeed.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 0757eec37..12b6cbdfd 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -596,7 +596,7 @@ class Activity { $i['obj'] = json_decode($i['obj'],true); } if($i['obj']['type'] === ACTIVITY_OBJ_PHOTO) { - $i['obj']['id'] = $i['id']; + $i['obj']['id'] = $i['mid']; } $obj = self::encode_object($i['obj']); diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php index 381e3acb2..8c13682b4 100644 --- a/Zotlabs/Module/Zotfeed.php +++ b/Zotlabs/Module/Zotfeed.php @@ -42,7 +42,7 @@ class Zotfeed extends \Zotlabs\Web\Controller { } logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG); - + $result['project'] = 'Hubzilla'; $result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate)); $result['success'] = true; json_return_and_die($result); |