Merge pull request #10917 from MrPetovan/bug/10914-event-feed-time

Add event timezone in Model\Event::getHTML

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index b9f9b4c7f6a3e4b6c399fffa095a9658fbb92337..9bd7793e4269811798075ee876ff04cf27f57455 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -121,7 +121,7 @@ function fbrowser_content(App $a)
                                $tpl = Renderer::getMarkupTemplate($template_file);
                                $o = Renderer::replaceMacros($tpl, [
                                        '$type'     => 'file',
-                                       '$path'     => [ [ "", DI::l10n()->t("Files")] ],
+                                       '$path'     => ['' => DI::l10n()->t('Files')],
                                        '$folders'  => false,
                                        '$files'    => $files,
                                        '$cancel'   => DI::l10n()->t('Cancel'),

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 5ee1b65d88cd0885833e8c12f084716ad780f552..232c80e5bd389abfe808f805be4af6ce3c7bf09c 100644 (file)
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -31,6 +31,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -84,11 +85,8 @@ class Objects extends BaseModule
                                $requester_id = Contact::getIdForURL($requester, $item['uid']);
                                if (!empty($requester_id)) {
                                        $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
-                                       if (!empty($permissionSets)) {
-                                               $psid = array_merge($permissionSets->column('id'),
-                                                       [DI::permissionSet()->selectPublicForUser($item['uid'])]);
-                                               $validated = in_array($item['psid'], $psid);
-                                       }
+                                       $psids = array_merge($permissionSets->column('id'), [PermissionSet::PUBLIC]);
+                                       $validated = in_array($item['psid'], $psids);
                                }
                        }
                }