Merge pull request #1564 from getnikola/fix-xsl-path

fix #1563 -- fix rss.xsl path for subdir sites
getnikola · Jan 2, 2015 · 6f1bd8a · 6f1bd8a
2 parents 82aab2a + baf9014
commit 6f1bd8a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -63,6 +63,8 @@ Features
 Bugfixes
 --------
 
+* Fixed ``rss.xsl`` path for blogs not deployed to server root
+  (Issue #1563)
 * Respect SHOW_UNTRANSLATED_POSTS = False in archives
   and for untranslated source files (Issue #1360)
 * Make sure drafts don’t appear in sitemaps with multiple languages

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -1017,7 +1017,8 @@ def generic_rss_renderer(self, lang, title, link, description, timeline, output_
         )
 
         if feed_url:
-            rss_obj.xsl_stylesheet_href = self.url_replacer(feed_url, "/assets/xml/rss.xsl")
+            absurl = '/' + feed_url[len(self.config['BASE_URL']):]
+            rss_obj.xsl_stylesheet_href = self.url_replacer(absurl, "/assets/xml/rss.xsl")
 
         items = []
 

diff --git a/nikola/plugins/task/rss.py b/nikola/plugins/task/rss.py
@@ -51,6 +51,7 @@ def gen_tasks(self):
             "filters": self.site.config["FILTERS"],
             "blog_title": self.site.config["BLOG_TITLE"],
             "site_url": self.site.config["SITE_URL"],
+            "base_url": self.site.config["BASE_URL"],
             "blog_description": self.site.config["BLOG_DESCRIPTION"],
             "output_folder": self.site.config["OUTPUT_FOLDER"],
             "rss_teasers": self.site.config["RSS_TEASERS"],

diff --git a/nikola/plugins/task/tags.py b/nikola/plugins/task/tags.py
@@ -58,6 +58,7 @@ def gen_tasks(self):
             "translations": self.site.config["TRANSLATIONS"],
             "blog_title": self.site.config["BLOG_TITLE"],
             "site_url": self.site.config["SITE_URL"],
+            "base_url": self.site.config["BASE_URL"],
             "messages": self.site.MESSAGES,
             "output_folder": self.site.config['OUTPUT_FOLDER'],
             "filters": self.site.config['FILTERS'],