fix(template): external feed URL not correctly parseed

sparanoid · Feb 3, 2017 · 432371c · 432371c
1 parent 90f6d0f
commit 432371c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/_app/_includes/amsf/urls b/_app/_includes/amsf/urls
@@ -23,7 +23,14 @@
 {% comment %}
   Feed URL
 {% endcomment %}
-{% capture amsf_feed_url %}{{ site.feed | relative_url | replace: '/index.xml', '/' }}{% endcapture %}
+{% capture amsf_feed_url %}
+  {% include amsf/has_protocol url=site.feed %}
+  {% if amsf_has_protocol == null %}
+    {{ site.feed | relative_url | replace: '/index.xml', '/' }}
+  {% else %}
+    {{ site.feed }}
+  {% endif %}
+{% endcapture %}
 
 {% comment %}
   Page title

diff --git a/_app/_includes/themes/curtana/includes/footer.html b/_app/_includes/themes/curtana/includes/footer.html
@@ -13,7 +13,7 @@
         <li><a href="{{ '/email-signup' | relative_url }}/">Email</a></li>
       {% endif %}
 
-      <li><a href="{{ amsf_feed_url }}" title="Feed - Atom (The Atom Syndication Format)">Atom</a></li>
+      <li><a href="{{ amsf_feed_url | strip }}" title="Feed - Atom (The Atom Syndication Format)">Atom</a></li>
     </ul>
   </footer>
 {% endunless %}

diff --git a/_app/_includes/themes/curtana/includes/top.html b/_app/_includes/themes/curtana/includes/top.html
@@ -15,7 +15,7 @@
 <meta name="theme-color" content="{{ amsf_theme_color | strip }}">
 
 <!-- Feed URL -->
-<link rel="alternate" href="{{ amsf_feed_url }}" type="application/atom+xml">
+<link rel="alternate" href="{{ amsf_feed_url | strip }}" type="application/atom+xml">
 
 <!-- Site icons -->
 {{ amsf_favicons }}