From ad3aed389f2e0d69802641f5a5b7c6add73f1ce5 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Wed, 5 Dec 2018 02:40:16 +0100
Subject: templateoption

---
 app/class/modelrender.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/class/modelrender.php')

diff --git a/app/class/modelrender.php b/app/class/modelrender.php
index 484fae3..d2cdbb4 100644
--- a/app/class/modelrender.php
+++ b/app/class/modelrender.php
@@ -136,6 +136,11 @@ class Modelrender extends Modelart
 
 		$head .= '<meta charset="utf8" />' . PHP_EOL;
 		$head .= '<title>' . $this->art->title() . '</title>' . PHP_EOL;
+		if(!empty($this->art->favicon())) {
+			$head .= '<link rel="shortcut icon" href="'.Model::faviconpath(). $this->art->favicon(). '" type="image/x-icon">';
+		} elseif(!empty(Config::defaultfavicon())) {
+			$head .= '<link rel="shortcut icon" href="'.Model::faviconpath(). Config::defaultfavicon(). '" type="image/x-icon">';
+		}
 		$head .= '<meta name="description" content="' . $this->art->description() . '" />' . PHP_EOL;
 		$head .= '<meta name="viewport" content="width=device-width" />' . PHP_EOL;
 		$head .= '<link href="' . Model::globalpath() . 'fonts.css" rel="stylesheet" />' . PHP_EOL;
@@ -154,7 +159,7 @@ class Modelrender extends Modelart
 		$head .= '<link href="' . Model::renderpath() . $this->art->id() . '.css" rel="stylesheet" />' . PHP_EOL;
 
 		if (!empty($this->art->templatejavascript())) {
-			$templatejsart = $this->art->templatejavascript;
+			$templatejsart = $this->art->templatejavascript();
 			$head .= '<script src="' . Model::renderpath() . $templatejsart . '.js" async/></script>' . PHP_EOL;
 		}
 		$head .= '<script src="' . Model::renderpath() . $this->art->id() . '.js" async/></script>' . PHP_EOL;
-- 
cgit v1.2.3