From 30560491423e704f7f1f3502f1e9b5b47a7b5b31 Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Wed, 5 Dec 2018 14:12:23 -0500
Subject: [PATCH] Use relative_url intead of baseurl

---
 _includes/head.html         | 6 +++---
 _includes/social_links.html | 2 +-
 _layouts/post.html          | 2 +-
 index.html                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/_includes/head.html b/_includes/head.html
index 260baab76a..4c183590a0 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -18,11 +18,11 @@
     <meta name="author" content="{{ site.author }}">
     {% if site.fb_page %}<meta property="fb:pages" content="{{ site.fb_page_id }}" />{% endif %}
     {% if page.categories %}<meta name="keywords" content="{{ page.categories | join: ', ' }}">{% endif %}
-    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-    <link rel="alternate" type="application/rss+xml" title="RSS Feed for {{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl }}" />
+    <link rel="canonical" href="{{ page.url | absolute_url }}">
+    <link rel="alternate" type="application/rss+xml" title="RSS Feed for {{ site.title }}" href="{{ "/feed.xml" | relative_url }}" />
 
     <!-- Custom CSS -->
-    <link rel="stylesheet" href="{{ "/css/pixyll.css" | prepend: site.baseurl }}?{{ site.time | date: "%Y%m%d%H%M" }}" type="text/css">
+    <link rel="stylesheet" href="{{ "/css/pixyll.css" | relative_url }}?{{ site.time | date: "%Y%m%d%H%M" }}" type="text/css">
 
     <!-- Fonts -->
     {% if site.extended_fonts %}
diff --git a/_includes/social_links.html b/_includes/social_links.html
index 4762bc9dd8..831d2480ae 100644
--- a/_includes/social_links.html
+++ b/_includes/social_links.html
@@ -12,7 +12,7 @@
     {% if site.stackoverflow_id %}
       <a class="fa fa-stack-overflow" href="https://stackoverflow.com/users/{{ site.stackoverflow_id }}"></a>
     {% endif %}
-    <a class="fa fa-rss" href="{{ "/feed.xml" | prepend: site.baseurl }}"></a>
+    <a class="fa fa-rss" href="{{ "/feed.xml" | relative_url }}"></a>
     {% if site.twitter_username %}
       <a class="fa fa-twitter" href="https://twitter.com/{{ site.twitter_username }}"></a>
     {% endif %}
diff --git a/_layouts/post.html b/_layouts/post.html
index f4c487ae6d..22031d00fd 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -62,7 +62,7 @@ <h1>{{ page.title }}</h1>
   <h3 class="related-post-title">{{ site.text.post.related_posts }}</h3>
   {% for post in site.related_posts %}
     <div class="post ml2">
-      <a href="{{ post.url | prepend: site.baseurl }}" class="post-link">
+      <a href="{{ post.url | relative_url }}" class="post-link">
         <h4 class="post-title">{{ post.title }}</h4>
         <p class="post-summary">{{ post.summary }}</p>
       </a>
diff --git a/index.html b/index.html
index 7ce040acb4..4c52aa7877 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
       {% for post in paginator.posts %}
         <div class="post py3">
           <p class="post-meta">{{ post.date | date: site.date_format }}</p>
-          <a href="{{ post.url | prepend: site.baseurl }}" class="post-link"><h3 class="h1 post-title">{{ post.title }}</h3></a>
+          <a href="{{ post.url | relative_url }}" class="post-link"><h3 class="h1 post-title">{{ post.title }}</h3></a>
           <span class="post-summary">
             {% if post.summary %}
               {{ post.summary }}