lib/sitemap.xml in jekyll-sitemap-0.6.3 vs lib/sitemap.xml in jekyll-sitemap-0.7.0

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  {% capture site_url %}{% if site.url %}{{ site.url }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
+  {% capture site_url %}{% if site.url %}{{ site.url | append: site.baseurl }}{% else %}{{ site.github.url }}{% endif %}{% endcapture %}
   {% for post in site.posts %}{% unless post.sitemap == false %}
   <url>
-    <loc>{{ site_url }}{{ post.url }}</loc>
+    <loc>{{ post.url | prepend: site_url }}</loc>
     {% if post.last_modified_at %}
     <lastmod>{{ post.last_modified_at | date_to_xmlschema }}</lastmod>
     {% else %}
     <lastmod>{{ post.date | date_to_xmlschema }}</lastmod>
     {% endif %}
     <priority>0.8</priority>
   </url>
   {% endunless %}{% endfor %}
   {% for post in site.html_pages %}{% unless post.sitemap == false %}
   <url>
-    <loc>{{ site_url }}{{ post.url | replace:'index.html','' }}</loc>
+    <loc>{{ post.url | replace:'index.html','' | prepend: site_url }}</loc>
     <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
     <changefreq>weekly</changefreq>
     <priority>{% if post.url == "/" or post.url == "/index.html" %}1.0{% else %}0.7{% endif %}</priority>
   </url>
   {% endunless %}{% endfor %}
   {% for collection in site.collections %}{% unless collection.last.output == false %}
   {% for doc in collection.last.docs %}{% unless doc.sitemap == false %}
   <url>
-    <loc>{{ site_url }}{{ doc.url | replace:'index.html','' }}</loc>
+    <loc>{{ doc.url | replace:'index.html','' | prepend: site_url }}</loc>
     <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
     <changefreq>weekly</changefreq>
     <priority>{% if doc.url == "/" or doc.url == "/index.html" %}1.0{% else %}0.7{% endif %}</priority>
   </url>
   {% endunless %}{% endfor %}
   {% endunless %}{% endfor %}
   {% for file in site.html_files %}
   <url>
-    <loc>{{ site_url }}{{ file.path }}</loc>
+    <loc>{{ file.path | prepend: site_url }}</loc>
     <lastmod>{{ file.modified_time | date_to_xmlschema }}</lastmod>
     <priority>0.6</priority>
   </url>
   {% endfor %}
 </urlset>