Merge branch '2019.01-rc' into bug/6334-escape-get-app

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

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 0e85e16c466f6d5cdb073dff04387ee237c61297..8d9309a5bd4a3ccfb787f2663919fa09478c997b 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -8,9 +8,7 @@ namespace Friendica\Content\Widget;
 
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
-
-require_once 'boot.php';
-require_once 'include/text.php';
+use Friendica\Core\Renderer;
 
 /**
  * TagCloud widget
@@ -25,7 +23,11 @@ class CalendarExport
         * @return string Formated HTML of the calendar widget.
         */
        public static function getHTML() {
-               $a = get_app();
+               $a = \get_app();
+
+               if (empty($a->data['user'])) {
+                       return;
+               }
 
                $owner_uid = $a->data['user']['uid'];
 
@@ -56,8 +58,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"),