aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-08-05 19:13:44 +0200
committerMario <mario@mariovavti.com>2020-08-05 19:13:44 +0200
commitd9196bb82a1620c8ec1fe31d4ef7aa7c9f0d771f (patch)
tree3fcb376bba658d1014ee1bce09c8520435920e83
parentc56b140387aaf4247d7af56677d1cc18be3a6da9 (diff)
parent5ecbbfc7dfe1d1f3d36a02ac36b659538d6c5937 (diff)
downloadvolse-hubzilla-d9196bb82a1620c8ec1fe31d4ef7aa7c9f0d771f.tar.gz
volse-hubzilla-d9196bb82a1620c8ec1fe31d4ef7aa7c9f0d771f.tar.bz2
volse-hubzilla-d9196bb82a1620c8ec1fe31d4ef7aa7c9f0d771f.zip
Merge branch 'dev' into 'dev'
update profile|cover photo activities converted to z6 See merge request hubzilla/core!1865
-rw-r--r--Zotlabs/Module/Cover_photo.php8
-rwxr-xr-xinclude/items.php8
2 files changed, 0 insertions, 16 deletions
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index 615ca6fe0..dff645f2b 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -293,14 +293,6 @@ class Cover_photo extends \Zotlabs\Web\Controller {
$arr['item_thread_top'] = 1;
$arr['item_origin'] = 1;
$arr['item_wall'] = 1;
- $arr['obj_type'] = ACTIVITY_OBJ_PHOTO;
- $arr['verb'] = ACTIVITY_UPDATE;
-
- $arr['obj'] = json_encode(array(
- 'type' => $arr['obj_type'],
- 'id' => z_root() . '/photo/' . $photo['resource_id'] . '-7',
- 'link' => array('rel' => 'photo', 'type' => $photo['mimetype'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7')
- ));
if($profile && stripos($profile['gender'],t('female')) !== false)
$t = t('%1$s updated her %2$s');
diff --git a/include/items.php b/include/items.php
index dc76af31b..0cfa2a340 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4830,14 +4830,6 @@ function send_profile_photo_activity($channel,$photo,$profile) {
$arr['item_thread_top'] = 1;
$arr['item_origin'] = 1;
$arr['item_wall'] = 1;
- $arr['obj_type'] = ACTIVITY_OBJ_PHOTO;
- $arr['verb'] = ACTIVITY_UPDATE;
-
- $arr['obj'] = json_encode(array(
- 'type' => $arr['obj_type'],
- 'id' => z_root() . '/photo/profile/l/' . $channel['channel_id'],
- 'link' => array('rel' => 'photo', 'type' => $photo['type'], 'href' => z_root() . '/photo/profile/l/' . $channel['channel_id'])
- ));
if(stripos($profile['gender'],t('female')) !== false)
$t = t('%1$s updated her %2$s');