Fix favicon path + bump to v1.4.1

C-Lodder · C-Lodder · commit b586d683dd8d · 2022-02-17T13:36:30.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.4.1
+- Fix override favicon path
+
 ## 1.4.0
 - Add ability to override favicon
 - Favicon now displays on error and offline pages
diff --git a/error.php b/error.php
@@ -25,7 +25,7 @@
 $fontAwesome   = (boolean)$this->params->get('font-awesome-thats-actually-rather-shit', 1);
 $googleFont    = $this->params->get('google-font', '');
 $faviconPath   = (boolean)$this->params->get('favicon-override', 0)
-                 ? JPATH_ROOT
+                 ? Uri::root()
                  : 'templates/' . $this->template . '/favicon';
 
 // Template params
@@ -81,7 +81,7 @@
 
 $imageLayout = new FileLayout('lightning.favicon');
 $imageLayout->render([
-	'path' => 'templates/' . $this->template . '/favicon',
+	'path' => $faviconPath,
 ]);
 ?>
 <!DOCTYPE html>
diff --git a/index.php b/index.php
@@ -25,7 +25,7 @@
 $fontAwesome   = (boolean)$this->params->get('font-awesome-thats-actually-rather-shit', 1);
 $googleFont    = $this->params->get('google-font', '');
 $faviconPath   = (boolean)$this->params->get('favicon-override', 0)
-                 ? JPATH_ROOT
+                 ? Uri::root()
                  : 'templates/' . $this->template . '/favicon';
 
 // Load switcher CSS
@@ -93,7 +93,7 @@
 
 $imageLayout = new FileLayout('lightning.favicon');
 $imageLayout->render([
-	'path' => 'templates/' . $this->template . '/favicon',
+	'path' => $faviconPath,
 ]);
 
 $menu         = $this->getBuffer('modules', 'menu', $attribs = ['style' => 'none']);
diff --git a/joomla.asset.json b/joomla.asset.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
   "name": "lightning",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Joomla 4 template using HiQ CSS",
   "license": "GPL-2.0-or-later",
   "assets": [
diff --git a/offline.php b/offline.php
@@ -28,7 +28,7 @@
 $fontAwesome   = (boolean)$this->params->get('font-awesome-thats-actually-rather-shit', 1);
 $googleFont    = $this->params->get('google-font', '');
 $faviconPath   = (boolean)$this->params->get('favicon-override', 0)
-                 ? JPATH_ROOT
+                 ? Uri::root()
                  : 'templates/' . $this->template . '/favicon';
 
 // Load switcher CSS
@@ -85,7 +85,7 @@
 
 $imageLayout = new FileLayout('lightning.favicon');
 $imageLayout->render([
-	'path' => 'templates/' . $this->template . '/favicon',
+	'path' => $faviconPath,
 ]);
 ?>
 <!DOCTYPE html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lightning",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Joomla 4 template using HiQ",
   "repository": {
     "type": "git",
diff --git a/templateDetails.xml b/templateDetails.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="template" client="site" method="upgrade">
 	<name>lightning</name>
-	<version>1.4.0</version>
+	<version>1.4.1</version>
 	<creationDate>9th March 2020</creationDate>
 	<author>JoomJunk</author>
 	<authorEmail>admin@joomjunk.co.uk</authorEmail>
diff --git a/updates/lightning_updates.xml b/updates/lightning_updates.xml
@@ -4,10 +4,10 @@
 		<description>Joomla 4 template using HiQ CSS</description>
 		<element>lightning</element>
 		<type>template</type>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 		<infourl title="Lightning Release Notes">https://github.com/C-Lodder/lightning/blob/master/CHANGELOG.md</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/C-Lodder/lightning/releases/download/v1.4.0/tpl_lightning-v1.4.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/C-Lodder/lightning/releases/download/v1.4.1/tpl_lightning-v1.4.1.zip</downloadurl>
 		</downloads>
 		<maintainer>Charlie Lodder</maintainer>
 		<maintainerurl>https://joomjunk.co.uk</maintainerurl>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",`
`3`	`3`	`"name": "lightning",`
`4`		`- "version": "1.4.0",`
	`4`	`+ "version": "1.4.1",`
`5`	`5`	`"description": "Joomla 4 template using HiQ CSS",`
`6`	`6`	`"license": "GPL-2.0-or-later",`
`7`	`7`	`"assets": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lightning",`
`3`		`- "version": "1.4.0",`
	`3`	`+ "version": "1.4.1",`
`4`	`4`	`"description": "Joomla 4 template using HiQ",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`