diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-06-23 21:15:26 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-06-23 21:15:26 +0200 |
| commit | dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879 (patch) | |
| tree | 5fb84907619bdc02c7434dcf6318bbbae5786dfe /Zotlabs/Lib/Activity.php | |
| parent | cf791a19099e0e4a8a0679e720a4f99755083cca (diff) | |
| parent | 6e91bee0ba605b938bddf0570e747d6d7be1c712 (diff) | |
| download | volse-hubzilla-dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879.tar.gz volse-hubzilla-dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879.tar.bz2 volse-hubzilla-dfcd8395d5aff83b8d6e1fa83346f0f0bd78f879.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 3c1b140a0..2b723bb57 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -42,9 +42,6 @@ class Activity { if ($x['type'] === ACTIVITY_OBJ_EVENT) { return self::fetch_event($x); } - if ($x['type'] === ACTIVITY_OBJ_PHOTO) { - return self::fetch_image($x); - } call_hooks('encode_object', $x); } @@ -194,6 +191,7 @@ class Activity { } static function fetch_image($x) { + $ret = [ 'type' => 'Image', 'id' => $x['id'], @@ -2264,7 +2262,6 @@ class Activity { $s['app'] = escape_tags($generator['name']); } - if (!$response_activity) { $a = self::decode_taxonomy($act->obj); if ($a) { @@ -2399,7 +2396,7 @@ class Activity { } - if ($act->obj['type'] === 'Image') { + if ($act->obj['type'] === 'Image' && strpos($s['body'],'zrl=') === false) { $ptr = null; |