Merge pull request #6324 from MrPetovan/bug/6316-remove-html-encode

[friendica.git] / src / Content / Widget / CalendarExport.php

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 2129cd515c3cddc88eb6d43bfe9f1e0aebb8aa8a..e8bec0b95a451211e97ed2b5373bb099dc63dc5b 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -8,6 +8,7 @@ namespace Friendica\Content\Widget;
 
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 require_once 'boot.php';
 require_once 'include/text.php';
@@ -27,6 +28,10 @@ class CalendarExport
        public static function getHTML() {
                $a = get_app();
 
+               if (empty($a->data['user'])) {
+                       return;
+               }
+
                $owner_uid = $a->data['user']['uid'];
 
                // The permission testing is a little bit tricky because we have to respect many cases.
@@ -36,6 +41,10 @@ class CalendarExport
                        return;
                }
 
+               /*
+                * If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
+                * export feature isn't enabled.
+                */
                /*
                 * Cal logged in user (test permission at foreign profile page).
                 * If the $owner uid is available we know it is part of one of the profile pages (like /cal).
@@ -52,8 +61,8 @@ class CalendarExport
                // of the profile page it should be the personal /events page. So we can use $a->user.
                $user = defaults($a->data['user'], 'nickname', $a->user['nickname']);
 
-               $tpl = get_markup_template("events_aside.tpl");
-               $return = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("events_aside.tpl");
+               $return = Renderer::replaceMacros($tpl, [
                        '$etitle'      => L10n::t("Export"),
                        '$export_ical' => L10n::t("Export calendar as ical"),
                        '$export_csv'  => L10n::t("Export calendar as csv"),