From 64ae9c4f86bf867acede0389102b1f9007038cc3 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sat, 1 Oct 2022 13:18:35 -0400
Subject: [PATCH] Refactor media_baseurl MACRO to media_basepath MACRO

Prevent name collision with media_basepath root_template/page property
of same name. Also fix application of trailing forward slash to path
based on existence of baseurl property.
---
 templates/shared-utils.tpl.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/shared-utils.tpl.html b/templates/shared-utils.tpl.html
index e7d5c85..52ad659 100644
--- a/templates/shared-utils.tpl.html
+++ b/templates/shared-utils.tpl.html
@@ -44,10 +44,10 @@
 <!--% IF baseurl %-->./<!--% ELSE %-->/<!--% END %-->
 <!--% END %-->
 
-<!--% MACRO media_baseurl(baseurl, media_hostname) BLOCK %-->
-<!--% IF media_hostname %-->
-https://<!--% media_hostname %-->/<!--% ELSE %-->
-<!--% baseurl %-->/<!--% END %-->
+<!--% MACRO media_basepath(baseurl, media_baseurl) BLOCK %-->
+<!--% IF media_baseurl %-->
+<!--% media_baseurl %--><!--% ELSE %-->
+<!--% IF baseurl %--><!--% baseurl %--><!--% ELSE %-->/<!--% END %-->
 <!--% END %-->
 
 <!--% MACRO step_navigation(baseurl, links, folder) BLOCK %-->