From 0b7ca61958be5c1bf33102e6fba6995979f8a873 Mon Sep 17 00:00:00 2001 From: nobody Date: Tue, 4 Aug 2020 16:25:33 -0700 Subject: update profile|cover photo activities converted to z6 --- Zotlabs/Module/Cover_photo.php | 8 -------- include/items.php | 8 -------- 2 files changed, 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'); -- cgit v1.2.3 From ea845aeacdaa00b35a86550d5f9b0d3fcd2b40d4 Mon Sep 17 00:00:00 2001 From: nobody Date: Sun, 16 Aug 2020 16:29:00 -0700 Subject: issue with DAV - moveInto and variable scope --- Zotlabs/Storage/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index ee96363c4..76295d922 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -27,7 +27,7 @@ class File extends DAV\Node implements DAV\IFile { * * filename (string) * * filetype (string) */ - private $data; + public $data; /** * @see \\Sabre\\DAV\\Auth\\Backend\\BackendInterface * @var \\Zotlabs\\Storage\\BasicAuth $auth -- cgit v1.2.3