Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477

[friendica.git] / mod / hovercard.php

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 047502fc344a6545cab7d3d76ee175eefd07856d..ca399196368b71b3151d616924b8e59a8ab19cca 100644 (file)
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -31,7 +31,7 @@ function hovercard_content()
 
        // Get out if the system doesn't have public access allowed
        if (intval(Config::get('system', 'block_public'))) {
-               System::httpExit(401);
+               throw new \Friendica\Network\HTTPException\ForbiddenException();
        }
 
        // Return the raw content of the template. We use this to make templates usable for js functions.
@@ -135,8 +135,10 @@ function get_template_content($template, $root = '')
 {
        // We load the whole template system to get the filename.
        // Maybe we can do it a little bit smarter if I get time.
-       $t = Renderer::getMarkupTemplate($template, $root);
-       $filename = $t->filename;
+       $templateEngine = Renderer::getTemplateEngine();
+       $template = $templateEngine->getTemplateFile($template, $root);
+
+       $filename = $template->filename;
 
        // Get the content of the template file
        if (file_exists($filename)) {